Update SAPI modules to interface with the new TSRM.

Enable thread-safety memory debugging in ISAPI when in debug mode

12 files changed, 13 insertions, 12 deletions

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 323d6d4900..f62d495510 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -652,6 +652,7 @@ static void basic_globals_ctor(BLS_D)
 
 #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
diff --git a/sapi/aolserver/aolserver.c b/sapi/aolserver/aolserver.c
index 8d39ac7ce4..ff4b97bfe1 100644
--- a/sapi/aolserver/aolserver.c
+++ b/sapi/aolserver/aolserver.c
@@ -605,7 +605,7 @@ int Ns_ModuleInit(char *server, char *module)
 {
 	php_ns_context *ctx;
 	
-	tsrm_startup(1, 1, 0);
+	tsrm_startup(1, 1, 0, NULL);
 	sapi_startup(&sapi_module);
 	sapi_module.startup(&sapi_module);
 	
diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c
index c9c30786ed..085a15fe78 100644
--- a/sapi/apache/mod_php4.c
+++ b/sapi/apache/mod_php4.c
@@ -589,7 +589,7 @@ CONST_PREFIX char *php_apache_value_handler_ex(cmd_parms *cmd, HashTable *conf,
 	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 @@ void php_init_handler(server_rec *s, pool *p)
 	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);
diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c
index 3f363b94e9..a895813c22 100644
--- a/sapi/apache2filter/sapi_apache2.c
+++ b/sapi/apache2filter/sapi_apache2.c
@@ -429,7 +429,7 @@ php_apache_server_shutdown(void *tmp)
 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);
diff --git a/sapi/caudium/caudium.c b/sapi/caudium/caudium.c
index 3724338d93..98ebf59758 100644
--- a/sapi/caudium/caudium.c
+++ b/sapi/caudium/caudium.c
@@ -780,7 +780,7 @@ void pike_module_init( void )
 {
   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);
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index d966527c26..d4a743fd2b 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -409,7 +409,7 @@ int main(int argc, char *argv[])
 #endif
 
 #ifdef ZTS
-	tsrm_startup(1,1,0);
+	tsrm_startup(1,1,0, NULL);
 #endif
 
 	sapi_startup(&sapi_module);
diff --git a/sapi/isapi/php4isapi.c b/sapi/isapi/php4isapi.c
index 1985bd63c9..4a19b1b015 100644
--- a/sapi/isapi/php4isapi.c
+++ b/sapi/isapi/php4isapi.c
@@ -630,7 +630,7 @@ __declspec(dllexport) BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, L
 {
 	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);
diff --git a/sapi/nsapi/nsapi.c b/sapi/nsapi/nsapi.c
index e7bd45ea83..8709eab78f 100644
--- a/sapi/nsapi/nsapi.c
+++ b/sapi/nsapi/nsapi.c
@@ -542,7 +542,7 @@ php4_init(pblock *pb, Session *sn, Request *rq)
 {
 	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);
diff --git a/sapi/phttpd/phttpd.c b/sapi/phttpd/phttpd.c
index 29733bcfd4..825fd2a3b5 100644
--- a/sapi/phttpd/phttpd.c
+++ b/sapi/phttpd/phttpd.c
@@ -283,7 +283,7 @@ int php_doit(PHLS_D SLS_DC)
 
 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);
 
diff --git a/sapi/pi3web/pi3web_sapi.c b/sapi/pi3web/pi3web_sapi.c
index cb009ed29b..fc34acdeb7 100644
--- a/sapi/pi3web/pi3web_sapi.c
+++ b/sapi/pi3web/pi3web_sapi.c
@@ -427,7 +427,7 @@ DWORD fnWrapperProc(LPCONTROL_BLOCK lpCB)
 }
 
 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);
diff --git a/sapi/roxen/roxen.c b/sapi/roxen/roxen.c
index 4b6feac3b0..8d4e1d66b0 100644
--- a/sapi/roxen/roxen.c
+++ b/sapi/roxen/roxen.c
@@ -703,7 +703,7 @@ void pike_module_init( void )
 {
   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	 
diff --git a/sapi/servlet/servlet.c b/sapi/servlet/servlet.c
index 1227a79f68..948389a1d7 100644
--- a/sapi/servlet/servlet.c
+++ b/sapi/servlet/servlet.c
@@ -255,7 +255,7 @@ JNIEXPORT void JNICALL Java_net_php_servlet_startup
 {
 
 #ifdef ZTS
-	tsrm_startup(1,1,0);
+	tsrm_startup(1, 1, 0, NULL);
 #else
 	if (setjmp(EG(bailout))!=0) {
 		ThrowServletException(jenv,"bailout");