cvs: php4 /sapi/cgi cgi_main.c
| From: | Thies C. Arntzen | Date: | Sun, 05 Aug 2001 14:04:23 +0000 |
| Subject: | cvs: php4 /sapi/cgi cgi_main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-6568@lists.php.net to get a copy of this message | ||
thies Sun Aug 5 10:04:23 2001 EDT
Modified files:
/php4/sapi/cgi cgi_main.c
Log:
module_shutdown() calls ts_free_thread in ZTS mode. so SG() cannot be accessed
afterwards.
Index: php4/sapi/cgi/cgi_main.c
diff -u php4/sapi/cgi/cgi_main.c:1.127 php4/sapi/cgi/cgi_main.c:1.128
--- php4/sapi/cgi/cgi_main.c:1.127 Sat Aug 4 21:42:45 2001
+++ php4/sapi/cgi/cgi_main.c Sun Aug 5 10:04:23 2001
@@ -769,7 +769,6 @@
}
php_request_shutdown((void *) 0);
- php_module_shutdown();
if (SG(request_info).path_translated) {
free(SG(request_info).path_translated);
@@ -778,6 +777,8 @@
if (cgi_sapi_module.php_ini_path_override) {
free(cgi_sapi_module.php_ini_path_override);
}
+
+ php_module_shutdown();
} zend_catch {
exit_status = -1;
} zend_end_try();