com php-src: Fixed ZTS build: ext/opcache/ZendAccelerator.c

From: Date: Mon, 13 Jan 2014 19:09:59 +0000
Subject: com php-src: Fixed ZTS build: ext/opcache/ZendAccelerator.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-75602@lists.php.net to get a copy of this message
Commit: 9c32d30020a96050d1767fa2738a0b7fd537f2ce Author: Dmitry Stogov <dmitry@zend.com> Mon, 13 Jan 2014 23:09:59 +0400 Parents: 8092de3ca304fa3874d1fec866c63838ae1fc38d Branches: PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9c32d30020a96050d1767fa2738a0b7fd537f2ce Log: Fixed ZTS build Changed paths: M ext/opcache/ZendAccelerator.c Diff: diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index d02a538..e9616b8 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -2705,14 +2705,6 @@ void accel_shutdown(TSRMLS_D) return; } - accel_free_ts_resources(); - zend_shared_alloc_shutdown(); - zend_compile_file = accelerator_orig_compile_file; - - if (zend_hash_find(EG(ini_directives), "include_path", sizeof("include_path"), (void **) &ini_entry) == SUCCESS) { - ini_entry->on_modify = orig_include_path_on_modify; - } - #if ZEND_EXTENSION_API_NO > PHP_5_3_X_API_NO if (ZCG(accel_directives).interned_strings_buffer) { # ifndef ZTS @@ -2728,6 +2720,13 @@ void accel_shutdown(TSRMLS_D) zend_interned_strings_restore = orig_interned_strings_restore; #endif + accel_free_ts_resources(); + zend_shared_alloc_shutdown(); + zend_compile_file = accelerator_orig_compile_file; + + if (zend_hash_find(EG(ini_directives), "include_path", sizeof("include_path"), (void **) &ini_entry) == SUCCESS) { + ini_entry->on_modify = orig_include_path_on_modify; + } } void zend_accel_schedule_restart(zend_accel_restart_reason reason TSRMLS_DC)

« previous php.cvs (#75602) next »