diff options
| author | Zeev Suraski <zeev@php.net> | 1999-06-05 19:00:56 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 1999-06-05 19:00:56 +0000 |
| commit | bbce669cea7121f3acf01a9a638a4590af404fcd (patch) | |
| tree | 513fb4b17e4480e279d3714b63b9d1284aac66a4 /main | |
| parent | 8b2fe60467468fef799a7ae0b9f943a62a5ec0df (diff) | |
| download | php-git-bbce669cea7121f3acf01a9a638a4590af404fcd.tar.gz | |
Move shutdown order into Zend
Diffstat (limited to 'main')
| -rw-r--r-- | main/main.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/main/main.c b/main/main.c index b105975fad..5218c570be 100644 --- a/main/main.c +++ b/main/main.c @@ -644,10 +644,9 @@ int php_request_startup(CLS_D ELS_DC PLS_DC SLS_DC) php3_printf("Unable to initialize request info.\n"); return FAILURE; } + + zend_activate(CLS_C ELS_CC); sapi_activate(SLS_C); - init_compiler(CLS_C ELS_CC); - init_executor(CLS_C ELS_CC); - startup_scanner(CLS_C); if (SG(request_info).auth_user) { zval *auth_user; @@ -705,11 +704,7 @@ void php_request_shutdown(void *dummy) php_ini_rshutdown(); - - shutdown_scanner(CLS_C); - shutdown_executor(ELS_C); - shutdown_compiler(CLS_C); - + zend_deactivate(CLS_C ELS_CC); sapi_deactivate(SLS_C); php3_destroy_request_info(NULL); |