diff options
| author | Dmitry Stogov <dmitry@php.net> | 2005-11-07 12:24:55 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2005-11-07 12:24:55 +0000 |
| commit | 9e1beb4f1c1255717bbd3809e71f36a6bba684a3 (patch) | |
| tree | 7fb261bf2d6fe6c4f645fd7dc7375990b93bc734 | |
| parent | 88edad9f0812b115fc349596c85c50418950bcd0 (diff) | |
| download | php-git-9e1beb4f1c1255717bbd3809e71f36a6bba684a3.tar.gz | |
Fixed bug #35009 (ZTS: Persistent resource destruct crashes when extension is compiled as shared)
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | Zend/zend.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -9,6 +9,8 @@ PHP NEWS - Fixed bug #35017 (Exception thrown in error handler may cause unexpected behavior). (Dmitry) - Fixed bug #35014 (array_product() always returns 0). (Ilia) +- Fixed bug #35009 (ZTS: Persistent resource destruct crashes when extension + is compiled as shared). (Dmitry) - Fixed bug #34851 (SO_RECVTIMEO and SO_SNDTIMEO socket options expect integer parameter on Windows). (Mike) - Fixed bug #31971 (ftp_login fails on some SSL servers). diff --git a/Zend/zend.c b/Zend/zend.c index 3465e55ab6..2c790bf1b8 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -702,6 +702,7 @@ void zend_shutdown(TSRMLS_D) #ifdef ZEND_WIN32 zend_shutdown_timeout_thread(); #endif + zend_destroy_rsrc_list(&EG(persistent_list) TSRMLS_CC); zend_hash_graceful_reverse_destroy(&module_registry); zend_hash_destroy(GLOBAL_FUNCTION_TABLE); @@ -719,7 +720,6 @@ void zend_shutdown(TSRMLS_D) zend_hash_destroy(GLOBAL_CONSTANTS_TABLE); free(GLOBAL_CONSTANTS_TABLE); - zend_destroy_rsrc_list(&EG(persistent_list) TSRMLS_CC); #ifdef ZTS GLOBAL_FUNCTION_TABLE = NULL; GLOBAL_CLASS_TABLE = NULL; |