cvs: php4 /ext/standard basic_functions.c /sapi/aolserver aolserver.c /sapi/apache mod_php4.c /sapi/apache2filter sapi_apache2.c /sapi/caudium
caudium.c /sapi/cgi cgi_main.c /sapi/isapi php4isapi.c /sapi/nsapi nsapi.c /sapi/phttpd phttpd.c /sapi/pi3web pi3web_sapi.c /sapi/roxen roxen.c
/sapi/servlet servlet.c

zeev Fri Nov 17 18:44:06 2000 EDT Modified files: /php4/ext/standard basic_functions.c /php4/sapi/aolserver aolserver.c /php4/sapi/apache mod_php4.c /php4/sapi/apache2filter sapi_apache2.c /php4/sapi/caudium caudium.c /php4/sapi/cgi cgi_main.c /php4/sapi/isapi php4isapi.c /php4/sapi/nsapi nsapi.c /php4/sapi/phttpd phttpd.c /php4/sapi/pi3web pi3web_sapi.c /php4/sapi/roxen roxen.c /php4/sapi/servlet servlet.c Log: Update SAPI modules to interface with the new TSRM. Enable thread-safety memory debugging in ISAPI when in debug mode

Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.275 php4/ext/standard/basic_functions.c:1.276 --- php4/ext/standard/basic_functions.c:1.275 Fri Nov 3 17:18:10 2000 +++ php4/ext/standard/basic_functions.c Fri Nov 17 18:44:01 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.275 2000/11/04 01:18:10 jmcastagnetto Exp $ */ +/* $Id: basic_functions.c,v 1.276 2000/11/18 02:44:01 zeev Exp $ */ #include "php.h" #include "php_main.h" @@ -652,6 +652,7 @@ #ifdef TRANS_SID memset(&BG(url_adapt_state), 0, sizeof(BG(url_adapt_state))); + memset(&BG(url_adapt_state_ex), 0, sizeof(BG(url_adapt_state_ex))); #endif #ifdef PHP_WIN32 Index: php4/sapi/aolserver/aolserver.c diff -u php4/sapi/aolserver/aolserver.c:1.52 php4/sapi/aolserver/aolserver.c:1.53 --- php4/sapi/aolserver/aolserver.c:1.52 Sat Nov 11 10:35:15 2000 +++ php4/sapi/aolserver/aolserver.c Fri Nov 17 18:44:01 2000 @@ -22,7 +22,7 @@ * - CGI/1.1 conformance */ -/* $Id: aolserver.c,v 1.52 2000/11/11 18:35:15 sas Exp $ */ +/* $Id: aolserver.c,v 1.53 2000/11/18 02:44:01 zeev Exp $ */ /* conflict between PHP and AOLserver headers */ #define Debug php_Debug @@ -211,7 +211,7 @@ NSLS_FETCH(); php_info_print_table_start(); - php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.52 2000/11/11 18:35:15 sas Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.53 2000/11/18 02:44:01 zeev 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()); @@ -605,7 +605,7 @@ { php_ns_context *ctx; - tsrm_startup(1, 1, 0); + tsrm_startup(1, 1, 0, NULL); sapi_startup(&sapi_module); sapi_module.startup(&sapi_module); Index: php4/sapi/apache/mod_php4.c diff -u php4/sapi/apache/mod_php4.c:1.76 php4/sapi/apache/mod_php4.c:1.77 --- php4/sapi/apache/mod_php4.c:1.76 Wed Nov 1 03:23:52 2000 +++ php4/sapi/apache/mod_php4.c Fri Nov 17 18:44:02 2000 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.c,v 1.76 2000/11/01 11:23:52 andi Exp $ */ +/* $Id: mod_php4.c,v 1.77 2000/11/18 02:44:02 zeev Exp $ */ #define NO_REGEX_EXTRA_H #ifdef WIN32 @@ -589,7 +589,7 @@ if (!apache_php_initialized) { apache_php_initialized = 1; #ifdef ZTS - tsrm_startup(1, 1, 0); + tsrm_startup(1, 1, 0, NULL); #endif sapi_startup(&sapi_module_conf); php_apache_startup(&sapi_module_conf); @@ -708,7 +708,7 @@ if (!apache_php_initialized) { apache_php_initialized = 1; #ifdef ZTS - tsrm_startup(1, 1, 0); + tsrm_startup(1, 1, 0, NULL); #endif sapi_startup(&sapi_module_conf); php_apache_startup(&sapi_module_conf); Index: php4/sapi/apache2filter/sapi_apache2.c diff -u php4/sapi/apache2filter/sapi_apache2.c:1.21 php4/sapi/apache2filter/sapi_apache2.c:1.22 --- php4/sapi/apache2filter/sapi_apache2.c:1.21 Sat Nov 11 10:24:27 2000 +++ php4/sapi/apache2filter/sapi_apache2.c Fri Nov 17 18:44:02 2000 @@ -429,7 +429,7 @@ static void php_apache_server_startup(apr_pool_t *pchild, server_rec *s) { - tsrm_startup(1, 1, 0); + tsrm_startup(1, 1, 0, NULL); sapi_startup(&sapi_module); sapi_module.startup(&sapi_module); apr_register_cleanup(pchild, NULL, php_apache_server_shutdown, NULL); Index: php4/sapi/caudium/caudium.c diff -u php4/sapi/caudium/caudium.c:1.4 php4/sapi/caudium/caudium.c:1.5 --- php4/sapi/caudium/caudium.c:1.4 Mon Nov 6 14:11:10 2000 +++ php4/sapi/caudium/caudium.c Fri Nov 17 18:44:02 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: caudium.c,v 1.4 2000/11/06 22:11:10 neotron Exp $ */ +/* $Id: caudium.c,v 1.5 2000/11/18 02:44:02 zeev Exp $ */ #include "php.h" #ifdef HAVE_CAUDIUM @@ -450,7 +450,7 @@ { /* char buf[512]; */ php_info_print_table_start(); - php_info_print_table_row(2, "SAPI module version", "$Id: caudium.c,v 1.4 2000/11/06 22:11:10 neotron Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: caudium.c,v 1.5 2000/11/18 02:44:02 zeev 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()); @@ -780,7 +780,7 @@ { if (!caudium_php_initialized) { #ifdef ZTS - tsrm_startup(1, 1, 0); + tsrm_startup(1, 1, 0, NULL); caudium_globals_id = ts_allocate_id(sizeof(php_caudium_request), NULL, NULL); #endif sapi_startup(&sapi_module); Index: php4/sapi/cgi/cgi_main.c diff -u php4/sapi/cgi/cgi_main.c:1.86 php4/sapi/cgi/cgi_main.c:1.87 --- php4/sapi/cgi/cgi_main.c:1.86 Mon Nov 13 10:54:37 2000 +++ php4/sapi/cgi/cgi_main.c Fri Nov 17 18:44:02 2000 @@ -409,7 +409,7 @@ #endif #ifdef ZTS - tsrm_startup(1,1,0); + tsrm_startup(1,1,0, NULL); #endif sapi_startup(&sapi_module); Index: php4/sapi/isapi/php4isapi.c diff -u php4/sapi/isapi/php4isapi.c:1.59 php4/sapi/isapi/php4isapi.c:1.60 --- php4/sapi/isapi/php4isapi.c:1.59 Sun Oct 29 08:14:26 2000 +++ php4/sapi/isapi/php4isapi.c Fri Nov 17 18:44:03 2000 @@ -630,7 +630,7 @@ { switch (fdwReason) { case DLL_PROCESS_ATTACH: - tsrm_startup(1, 1, 0); + tsrm_startup(1, 1, TSRM_ERROR_LEVEL_CORE, "C:\\TSRM.log"); sapi_startup(&sapi_module); if (sapi_module.startup) { sapi_module.startup(&sapi_module); Index: php4/sapi/nsapi/nsapi.c diff -u php4/sapi/nsapi/nsapi.c:1.13 php4/sapi/nsapi/nsapi.c:1.14 --- php4/sapi/nsapi/nsapi.c:1.13 Sun Oct 29 08:14:26 2000 +++ php4/sapi/nsapi/nsapi.c Fri Nov 17 18:44:03 2000 @@ -542,7 +542,7 @@ { php_core_globals *core_globals; - tsrm_startup(1, 1, 0); + tsrm_startup(1, 1, 0, NULL); core_globals = ts_resource(core_globals_id); sapi_startup(&sapi_module); Index: php4/sapi/phttpd/phttpd.c diff -u php4/sapi/phttpd/phttpd.c:1.21 php4/sapi/phttpd/phttpd.c:1.22 --- php4/sapi/phttpd/phttpd.c:1.21 Sun Oct 29 08:14:26 2000 +++ php4/sapi/phttpd/phttpd.c Fri Nov 17 18:44:03 2000 @@ -283,7 +283,7 @@ int pm_init(const char **argv) { - tsrm_startup(1, 1, 0); + tsrm_startup(1, 1, 0, NULL); sapi_startup(&sapi_module); sapi_module.startup(&sapi_module); Index: php4/sapi/pi3web/pi3web_sapi.c diff -u php4/sapi/pi3web/pi3web_sapi.c:1.11 php4/sapi/pi3web/pi3web_sapi.c:1.12 --- php4/sapi/pi3web/pi3web_sapi.c:1.11 Sun Oct 29 08:14:27 2000 +++ php4/sapi/pi3web/pi3web_sapi.c Fri Nov 17 18:44:04 2000 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pi3web_sapi.c,v 1.11 2000/10/29 16:14:27 sas Exp $ */ +/* $Id: pi3web_sapi.c,v 1.12 2000/11/18 02:44:04 zeev Exp $ */ #if WIN32|WINNT # include <windows.h> @@ -80,7 +80,7 @@ PUTS("<table border=5 width=600>\n"); PUTS("<tr><th colspan=2 bgcolor=\"" PHP_HEADER_COLOR "\">Pi3Web Server Information</th></tr>\n"); php_info_print_table_header(2, "Information Field", "Value"); - php_info_print_table_row(2, "Pi3Web SAPI module version", "$Id: pi3web_sapi.c,v 1.11 2000/10/29 16:14:27 sas Exp $"); + php_info_print_table_row(2, "Pi3Web SAPI module version", "$Id: pi3web_sapi.c,v 1.12 2000/11/18 02:44:04 zeev Exp $"); php_info_print_table_row(2, "Server Name Stamp", HTTPCore_getServerStamp()); snprintf(variable_buf, 511, "%d", HTTPCore_debugEnabled()); php_info_print_table_row(2, "Debug Enabled", variable_buf); @@ -427,7 +427,7 @@ } BOOL PHP4_startup() { - tsrm_startup(1, 1, 0); + tsrm_startup(1, 1, 0, NULL); sapi_startup(&sapi_module); if (sapi_module.startup) { sapi_module.startup(&sapi_module); Index: php4/sapi/roxen/roxen.c diff -u php4/sapi/roxen/roxen.c:1.38 php4/sapi/roxen/roxen.c:1.39 --- php4/sapi/roxen/roxen.c:1.38 Sun Oct 29 08:14:27 2000 +++ php4/sapi/roxen/roxen.c Fri Nov 17 18:44:04 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: roxen.c,v 1.38 2000/10/29 16:14:27 sas Exp $ */ +/* $Id: roxen.c,v 1.39 2000/11/18 02:44:04 zeev Exp $ */ #include "php.h" #ifdef HAVE_ROXEN @@ -446,7 +446,7 @@ { /* char buf[512]; */ php_info_print_table_start(); - php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c,v 1.38 2000/10/29 16:14:27 sas Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c,v 1.39 2000/11/18 02:44:04 zeev 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()); @@ -703,7 +703,7 @@ { if (!roxen_php_initialized) { #ifdef ZTS - tsrm_startup(1, 1, 0); + tsrm_startup(1, 1, 0, NULL); #ifdef ROXEN_USE_ZTS roxen_globals_id = ts_allocate_id(sizeof(php_roxen_request), NULL, NULL); #endif Index: php4/sapi/servlet/servlet.c diff -u php4/sapi/servlet/servlet.c:1.39 php4/sapi/servlet/servlet.c:1.40 --- php4/sapi/servlet/servlet.c:1.39 Fri Sep 8 07:43:57 2000 +++ php4/sapi/servlet/servlet.c Fri Nov 17 18:44:04 2000 @@ -255,7 +255,7 @@ { #ifdef ZTS - tsrm_startup(1,1,0); + tsrm_startup(1, 1, 0, NULL); #else if (setjmp(EG(bailout))!=0) { ThrowServletException(jenv,"bailout");