cvs: /php4 SAPI.c /php4/sapi/aolserver aolserver.c /php4/sapi/phttpd phttpd.c

sas Wed Jan 5 14:25:20 2000 EDT Modified files: /php4 SAPI.c /php4/sapi/aolserver aolserver.c /php4/sapi/phttpd phttpd.c Log: Move reentrancy initialisation/destruction into SAPI. These calls only do something, if reentrancy emulation is required. Index: php4/SAPI.c diff -u php4/SAPI.c:1.39 php4/SAPI.c:1.40 --- php4/SAPI.c:1.39 Fri Dec 31 20:31:27 1999 +++ php4/SAPI.c Wed Jan 5 14:25:17 2000 @@ -75,12 +75,14 @@ #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); } Index: php4/sapi/aolserver/aolserver.c diff -u php4/sapi/aolserver/aolserver.c:1.26 php4/sapi/aolserver/aolserver.c:1.27 --- php4/sapi/aolserver/aolserver.c:1.26 Fri Dec 31 20:31:59 1999 +++ php4/sapi/aolserver/aolserver.c Wed Jan 5 14:25:18 2000 @@ -22,7 +22,7 @@ * - CGI/1.1 conformance */ -/* $Id: aolserver.c,v 1.26 2000/01/01 01:31:59 sas Exp $ */ +/* $Id: aolserver.c,v 1.27 2000/01/05 19:25:18 sas Exp $ */ /* conflict between PHP and AOLserver headers */ #define Debug php_Debug @@ -206,7 +206,7 @@ NSLS_FETCH(); PUTS("<table border=5 width=600>\n"); - php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.26 2000/01/01 01:31:59 sas Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.27 2000/01/05 19:25:18 sas Exp $"); php_info_print_table_row(2, "Build date", Ns_InfoBuildDate()); php_info_print_table_row(2, "Config file path", Ns_InfoConfigFile()); php_info_print_table_row(2, "Error Log path", Ns_InfoErrorLog()); @@ -574,7 +574,6 @@ ctx->sapi_module->shutdown(ctx->sapi_module); sapi_shutdown(); - reentrancy_shutdown(); tsrm_shutdown(); free(ctx->ns_module); @@ -594,7 +593,6 @@ php_ns_context *ctx; tsrm_startup(1, 1, 0); - reentrancy_startup(); sapi_startup(&sapi_module); sapi_module.startup(&sapi_module); Index: php4/sapi/phttpd/phttpd.c diff -u php4/sapi/phttpd/phttpd.c:1.4 php4/sapi/phttpd/phttpd.c:1.5 --- php4/sapi/phttpd/phttpd.c:1.4 Fri Dec 31 20:32:02 1999 +++ php4/sapi/phttpd/phttpd.c Wed Jan 5 14:25:19 2000 @@ -268,7 +268,6 @@ int pm_init(const char **argv) { tsrm_startup(1, 1, 0); - reentrancy_startup(); sapi_startup(&sapi_module); sapi_module.startup(&sapi_module);