Update SAPI modules to interface with the new TSRM.

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

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 323d6d49002d23bc83ece041ff725465cc552403..f62d495510c2c6dd08a99e4d023c0dd9fa74993f 100644 (file)
--- 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 8d39ac7ce42cdcd75667fa0b26dad5eb87f38952..ff4b97bfe10853d5d72235abb4dbd9fe428d9eb9 100644 (file)
--- 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 c9c30786ed410f12cdd919ae18371ba0cd35d62b..085a15fe787873945a5fef8ba1adc3237ec05f6c 100644 (file)
--- 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 3f363b94e92b41504efa101bf193831ae71e58b9..a895813c221490ca7cf45ee7457884eb65a4487d 100644 (file)
--- 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 3724338d930e4d5bc2504f5665c3bf3130f7616f..98ebf59758d6df5f0756ff136fa2bc1b2022f5c9 100644 (file)
--- 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 d966527c2687cd7b1d17ec3fa4a01bb64647e769..d4a743fd2b9a7e5a27970661d52d5864cf09d8f1 100644 (file)
--- 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 1985bd63c99fdbe55ff4ead5efc4b269efd5a999..4a19b1b015faeb81d02526c64cc89c426509a46b 100644 (file)
--- 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 e7bd45ea830e19b6593f22fe7a19dce2351652b1..8709eab78f40e36352dea533f9f1faedec91fc6d 100644 (file)
--- 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 29733bcfd47eb44af15e15b57197682dc781d7e8..825fd2a3b508cb4c03b8b2d82315885857111dae 100644 (file)
--- 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 cb009ed29bfd0d30cfd6193dbf74f16271b9f3e4..fc34acdeb7014de1da51d246188a9c4882ad07c7 100644 (file)
--- 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 4b6feac3b0ee269c2c5ebad4ef9e1ae0d3cefaf8..8d4e1d66b0f90e19ed6e6a499a2ee390d389375c 100644 (file)
--- 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 1227a79f68f15a192191688e7a2527fd6a4c29a5..948389a1d7b23e40f35176db1b941b04846df4e0 100644 (file)
--- 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");