From: Thies C. Arntzen <thies@php.net>
Date: Sun, 5 Aug 2001 14:04:23 +0000 (+0000)
Subject: module_shutdown() calls ts_free_thread in ZTS mode. so SG() cannot be accessed
X-Git-Tag: PRE_ENGINE2_SPLIT~45
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0fe837b448ad16f3c6eb9b9c30290e1fa65a405c;p=php

module_shutdown() calls ts_free_thread in ZTS mode. so SG() cannot be accessed
afterwards.
---

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();