diff options
| author | Sascha Schumann <sas@php.net> | 2000-01-05 19:25:19 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2000-01-05 19:25:19 +0000 |
| commit | 304d60c8f318814f6aec8a2bc825dd8daeec1cbc (patch) | |
| tree | ea1629c1339727c8eea07492dc0fbe43e5125c0a | |
| parent | 9a07df6c4a11e8d2669754cfc55d06ada4d21a9f (diff) | |
| download | php-git-304d60c8f318814f6aec8a2bc825dd8daeec1cbc.tar.gz | |
Move reentrancy initialisation/destruction into SAPI.
These calls only do something, if reentrancy emulation is required.
| -rw-r--r-- | main/SAPI.c | 2 | ||||
| -rw-r--r-- | sapi/aolserver/aolserver.c | 2 | ||||
| -rw-r--r-- | sapi/phttpd/phttpd.c | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/main/SAPI.c b/main/SAPI.c index c7b94d05b8..f5782321e2 100644 --- a/main/SAPI.c +++ b/main/SAPI.c @@ -75,12 +75,14 @@ SAPI_API void sapi_startup(sapi_module_struct *sf) #ifdef ZTS sapi_globals_id = ts_allocate_id(sizeof(sapi_globals_struct), NULL, NULL); #endif + reentrancy_startup(); php_global_startup_internal_extensions(); } SAPI_API void sapi_shutdown(void) { + reentrancy_shutdown(); php_global_shutdown_internal_extensions(); zend_hash_destroy(&known_post_content_types); } diff --git a/sapi/aolserver/aolserver.c b/sapi/aolserver/aolserver.c index fe8c9dc1e1..a6e2fe96b5 100644 --- a/sapi/aolserver/aolserver.c +++ b/sapi/aolserver/aolserver.c @@ -574,7 +574,6 @@ php_ns_server_shutdown(void *context) ctx->sapi_module->shutdown(ctx->sapi_module); sapi_shutdown(); - reentrancy_shutdown(); tsrm_shutdown(); free(ctx->ns_module); @@ -594,7 +593,6 @@ int Ns_ModuleInit(char *server, char *module) php_ns_context *ctx; tsrm_startup(1, 1, 0); - reentrancy_startup(); sapi_startup(&sapi_module); sapi_module.startup(&sapi_module); diff --git a/sapi/phttpd/phttpd.c b/sapi/phttpd/phttpd.c index 0425754604..a6697952cd 100644 --- a/sapi/phttpd/phttpd.c +++ b/sapi/phttpd/phttpd.c @@ -268,7 +268,6 @@ int php_doit(PHLS_D SLS_DC) int pm_init(const char **argv) { tsrm_startup(1, 1, 0); - reentrancy_startup(); sapi_startup(&sapi_module); sapi_module.startup(&sapi_module); |