archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 17:04:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'PHP-5.5' into PHP-5.6

Browse source 
* PHP-5.5:
  Fixed ZTS build
This commit is contained in:
Dmitry Stogov 2014-01-13 23:10:35 +04:00
commit 029d019dac
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
ext/opcache/ZendAccelerator.c
View file

@ -2718,14 +2718,6 @@ void accel_shutdown(TSRMLS_D)
return; 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 ZEND_EXTENSION_API_NO > PHP_5_3_X_API_NO
if (ZCG(accel_directives).interned_strings_buffer) { if (ZCG(accel_directives).interned_strings_buffer) {
# ifndef ZTS # ifndef ZTS
@ -2741,6 +2733,13 @@ void accel_shutdown(TSRMLS_D)
zend_interned_strings_restore = orig_interned_strings_restore; zend_interned_strings_restore = orig_interned_strings_restore;
#endif #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) void zend_accel_schedule_restart(zend_accel_restart_reason reason TSRMLS_DC)