From: Stanislav Malyshev <stas@php.net>
Date: Mon, 9 Mar 2015 00:24:11 +0000 (-0700)
Subject: Merge branch 'pull-request/1135'
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~755
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=33ef5c47a5dd30d1143bf716a07036f68853daa3;p=php

Merge branch 'pull-request/1135'

* pull-request/1135:
  Return void like other functions
  Use zend_parse_parameters_none()
  Implemented FR #45235 A way to clear or reset the results for error_get_last()
---

33ef5c47a5dd30d1143bf716a07036f68853daa3
diff --cc NEWS
index 44cb817de6,4f0518f303..40904fb5bf
--- a/NEWS
+++ b/NEWS
@@@ -53,6 -190,6 +53,7 @@@
    . Removed support for hexadecimal numeric strings. (Nikita)
    . Removed obsolete extensions and SAPIs. See the full list in UPGRADING. (Anatol)
    . Added NULL byte protection to exec, system and passthru. (Yasuo)
++  . Added error_clear_last() function. (Reeze Xia)
  
  - Curl:
    . Fixed bug #68937 (Segfault in curl_multi_exec). (Laruence)
diff --cc UPGRADING
index 9770c976be,af84ee94fe..7cc93a3b16
--- a/UPGRADING
+++ b/UPGRADING
@@@ -447,10 -436,6 +447,11 @@@ Othe
  
  - Standard
    . Added intdiv() function for integer division.
++  . Added error_clear_last() function to reset error state.
 +
 +- Stream:
 +  . Added stream_socket_crypto_info() allowing inspection of negotiated TLS
 +    connection properties
  
  ========================================
  7. New Classes and Interfaces