com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS Zend/zend.c Zend/zend_compile.h Zend/zend_execute_API.c
| From: | Stanislav Malyshev | Date: | Mon, 01 Sep 2014 19:20:34 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS Zend/zend.c Zend/zend_compile.h Zend/zend_execute_API.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81345@lists.php.net to get a copy of this message | ||
Commit: 57f82819e978e34b3f488eb9a00681174584f5f3
Author: Stanislav Malyshev <stas@php.net> Mon, 1 Sep 2014 12:19:31 -0700
Parents: f89b7ec38950e39b9bb1b566b6c567382c42248f 4b9fcc01d4cd17d3933c8f9c76fb37359117ce2e
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=57f82819e978e34b3f488eb9a00681174584f5f3
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
update NEWS
Only destruct if EG(active) in zend_shutdown(). (bug #65463, #66036)
Fix typo from commit 32314f6b6
Fix destruction order in zend_shutdown (bug #65463, #66036)
Bugs:
https://bugs.php.net/65463
https://bugs.php.net/66036
Changed paths:
MM NEWS
MM Zend/zend.c
MM Zend/zend_compile.h
MM Zend/zend_execute_API.c
Diff:
diff --cc NEWS
index 9777c0a,3b7a382..5d5e04e
--- a/NEWS
+++ b/NEWS
@@@ -1,49 -1,12 +1,52 @@@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2014, PHP 5.5.17
+
+?? ??? 2014, PHP 5.6.1
- Core:
- . Fixed bug #47358 (glob returns error, should be empty array()). (Pierre)
++ . Implemented FR #38409 (parse_ini_file() looses the type of booleans). (Tjerk)
+ . Fixed bug #65463 (SIGSEGV during zend_shutdown()). (Keyur Govande)
+ . Fixed bug #66036 (Crash on SIGTERM in apache process). (Keyur Govande)
. Fixed bug #67878 (program_prefix not honoured in man pages). (Remi)
+ . Fixed bug #67938 (Segfault when extending interface method with variadic).
+ (Nikita)
- . Implemented FR #38409 (parse_ini_file() looses the type of booleans). (Tjerk)
++
+
+- Fileinfo:
+ . Fixed bug #67731 (finfo::file() returns invalid mime type
+ for binary files).. (Anatol)
+
+- GD:
+ . Made fontFetch's path parser thread-safe. (Sara)
+
+- GMP:
+ . Fixed bug #67917 (Using GMP objects with overloaded operators can cause
+ memory exhaustion). (Nikita)
+
+- MySQLi:
+ . Fixed bug #67839 (mysqli does not handle 4-byte floats correctly). (Keyur)
+
+- OpenSSL:
+ . Fixed bug #67850 (extension won't build if openssl compiled without SSLv3).
+ (Daniel Lowrey)
+
+28 Aug 2014, PHP 5.6.0
+
+- Apache2 Handler SAPI:
+ . Fixed Apache log issue caused by APR's lack of support for %zu
+ (APR issue https://issues.apache.org/bugzilla/show_bug.cgi?id=56120).
+ (Jeff Trawick)
+
+- CLI server:
+ . Added some MIME types to the CLI web server. (Chris Jones)
+ . Fixed bug #67079 (Missing MIME types for XML/XSL files). (Anatol)
+ . Fixed bug #66830 (Empty header causes PHP built-in web server to hang).
+ (Adam)
+ . Fixed bug #67594 (Unable to access to apache_request_headers() elements).
+ (Tjerk)
+ . Implemented FR #67429 (CLI server is missing some new HTTP response codes).
+ (Adam)
+ . Fixed Bug #67406 (built-in web-server segfaults on startup). (Remi)
- COM:
. Fixed bug #41577 (DOTNET is successful once per server run)
diff --cc Zend/zend.c
index 34dcc75,cb5c39b..8919283
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@@ -822,11 -814,22 +822,25 @@@ void zend_shutdown(TSRMLS_D) /* {{{ *
zend_shutdown_timeout_thread();
#endif
zend_destroy_rsrc_list(&EG(persistent_list) TSRMLS_CC);
+
+ if (EG(active))
+ {
+ /*
+ * The order of destruction is important here.
+ * See bugs #65463 and 66036.
+ */
+ zend_hash_reverse_apply(GLOBAL_FUNCTION_TABLE, (apply_func_t) zend_cleanup_function_data_full
TSRMLS_CC);
+ zend_hash_reverse_apply(GLOBAL_CLASS_TABLE, (apply_func_t) zend_cleanup_user_class_data
TSRMLS_CC);
+ zend_cleanup_internal_classes(TSRMLS_C);
+ zend_hash_reverse_apply(GLOBAL_FUNCTION_TABLE, (apply_func_t) clean_non_persistent_function_full
TSRMLS_CC);
+ zend_hash_reverse_apply(GLOBAL_CLASS_TABLE, (apply_func_t) clean_non_persistent_class_full
TSRMLS_CC);
+ }
+
zend_destroy_modules();
+ virtual_cwd_deactivate(TSRMLS_C);
+ virtual_cwd_shutdown();
+
zend_hash_destroy(GLOBAL_FUNCTION_TABLE);
zend_hash_destroy(GLOBAL_CLASS_TABLE);