com php-src: Merge branch 'pull-request/1135': NEWS UPGRADING ext/standard/basic_functions.c
| From: | Stanislav Malyshev | Date: | Mon, 09 Mar 2015 00:26:38 +0000 |
| Subject: | com php-src: Merge branch 'pull-request/1135': NEWS UPGRADING ext/standard/basic_functions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-85368@lists.php.net to get a copy of this message | ||
Commit: 33ef5c47a5dd30d1143bf716a07036f68853daa3
Author: Stanislav Malyshev <stas@php.net> Sun, 8 Mar 2015 17:24:11 -0700
Parents: a8a77fff5c1835f6861a875e8252d3901b5c0ae1 916709cf8514e34a39426c6f127bb34096515324
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=33ef5c47a5dd30d1143bf716a07036f68853daa3
Log:
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()
Bugs:
https://bugs.php.net/45235
Changed paths:
MM NEWS
MM UPGRADING
MM ext/standard/basic_functions.c
Diff:
diff --cc NEWS
index 44cb817,4f0518f..40904fb
--- 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 9770c97,af84ee9..7cc93a3
--- 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