summaryrefslogtreecommitdiff
path: root/sapi
diff options
context:
space:
mode:
authorThies C. Arntzen <thies@php.net>2001-08-05 14:04:23 +0000
committerThies C. Arntzen <thies@php.net>2001-08-05 14:04:23 +0000
commit0fe837b448ad16f3c6eb9b9c30290e1fa65a405c (patch)
tree74f3b416d0771458dfb9d5d1a1a936b2ef0cc3eb /sapi
parent7168c314825707c5ed3c77c0a37228d2e95ac922 (diff)
downloadphp-git-0fe837b448ad16f3c6eb9b9c30290e1fa65a405c.tar.gz
module_shutdown() calls ts_free_thread in ZTS mode. so SG() cannot be accessed
afterwards.
Diffstat (limited to 'sapi')
-rw-r--r--sapi/cgi/cgi_main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index b0d6134c7d..723ec6aee0 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -769,7 +769,6 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine
}
php_request_shutdown((void *) 0);
- php_module_shutdown();
if (SG(request_info).path_translated) {
free(SG(request_info).path_translated);
@@ -778,6 +777,8 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine
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();