diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-07-30 17:36:47 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-07-30 17:36:47 +0400 |
| commit | 0aa342e903bf012efe03db1e9f1fe4ed54225e76 (patch) | |
| tree | cce04f954a5e376795deae2c093449ed6fb47891 /ext/opcache/ZendAccelerator.c | |
| parent | 5e1ac558c3354f98a9a5aecb5b518c46cd55357a (diff) | |
| parent | 3550f3d0aad6e979e2a6fe3ee40d4fbff168c34b (diff) | |
| download | php-git-0aa342e903bf012efe03db1e9f1fe4ed54225e76.tar.gz | |
Merge branch 'PHP-5.5'
* PHP-5.5:
Fixed bug #65338 (Enabling both php_opcache and php_wincache AVs on shutdown).
Conflicts:
NEWS
Diffstat (limited to 'ext/opcache/ZendAccelerator.c')
| -rw-r--r-- | ext/opcache/ZendAccelerator.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index ab774aa6a1..2c765f1be7 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -2660,12 +2660,9 @@ static void accel_free_ts_resources() #endif } -static void accel_shutdown(zend_extension *extension) +void accel_shutdown(TSRMLS_D) { zend_ini_entry *ini_entry; - TSRMLS_FETCH(); - - (void)extension; /* keep the compiler happy */ zend_accel_blacklist_shutdown(&accel_blacklist); @@ -2683,6 +2680,11 @@ static void accel_shutdown(zend_extension *extension) } #if ZEND_EXTENSION_API_NO > PHP_5_3_X_API_NO +# ifndef ZTS + zend_hash_clean(CG(function_table)); + zend_hash_clean(CG(class_table)); + zend_hash_clean(EG(zend_constants)); +# endif CG(interned_strings_start) = orig_interned_strings_start; CG(interned_strings_end) = orig_interned_strings_end; zend_new_interned_string = orig_new_interned_string; @@ -2759,7 +2761,7 @@ ZEND_EXT_API zend_extension zend_extension_entry = { "http://www.zend.com/", /* URL */ "Copyright (c) 1999-2013", /* copyright */ accel_startup, /* startup */ - accel_shutdown, /* shutdown */ + NULL, /* shutdown */ accel_activate, /* per-script activation */ accel_deactivate, /* per-script deactivation */ NULL, /* message handler */ |