From: Zeev Suraski <zeev@php.net>
Date: Wed, 5 May 1999 21:29:26 +0000 (+0000)
Subject: Fixes
X-Git-Tag: BEFORE_PHP4_APACHE_MODULE_CHANGE~94
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6f1c6118689f204eaeff7bcb06f313605925b252;p=php

Fixes
---

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 6ed4496eb5..2a8f59d75e 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -291,6 +291,8 @@ function_entry basic_functions[] = {
 	PHP_FE(ini_restore,					NULL)
 
 	PHP_FE(print_r,					NULL)
+	{"setcookie",		php3_SetCookie,		NULL},
+	{"header",			php3_Header,		NULL},
 
 	{NULL, NULL, NULL}
 };
diff --git a/ext/standard/head.c b/ext/standard/head.c
index 8e757a3e07..636f143803 100644
--- a/ext/standard/head.c
+++ b/ext/standard/head.c
@@ -221,6 +221,8 @@ void php3_Header(INTERNAL_FUNCTION_PARAMETERS)
 	}
 	convert_to_string(arg1);
 	php4i_add_header_information(arg1->value.str.val, arg1->value.str.len);
+	arg1->type = IS_LONG; /* change arg1's type so that it doesn't get freed */
+	arg1->value.lval = 0;
 }
 
 
@@ -572,8 +574,6 @@ int php3_headers_unsent(void)
 
 
 function_entry php3_header_functions[] = {
-	{"setcookie",		php3_SetCookie,		NULL},
-	{"header",			php3_Header,		NULL},
 	{NULL, NULL, NULL}
 };
 
diff --git a/main/SAPI.c b/main/SAPI.c
index af8f1f0b39..a8077265e7 100644
--- a/main/SAPI.c
+++ b/main/SAPI.c
@@ -48,6 +48,9 @@ SAPI_API void sapi_activate(SLS_D)
 SAPI_API void sapi_deactivate(SLS_D)
 {
 	zend_llist_destroy(&SG(sapi_headers).headers);
+	if (SG(sapi_headers).content_type.header) {
+		efree(SG(sapi_headers).content_type.header);
+	}
 }
 
 
diff --git a/main/main.c b/main/main.c
index 60d4bab7a2..0ce2c62570 100644
--- a/main/main.c
+++ b/main/main.c
@@ -669,16 +669,18 @@ void php_request_shutdown(void *dummy)
 	
 	php_ini_rshutdown();
 
+
 	shutdown_scanner(CLS_C);
 	shutdown_compiler(CLS_C);
 	shutdown_executor(ELS_C);
 
+	sapi_deactivate(SLS_C);
+
 	php3_destroy_request_info(NULL);
 	shutdown_memory_manager(PG(unclean_shutdown), 0);
 	php3_unset_timeout();
 
 
-	sapi_deactivate(SLS_C);
 
 #if CGI_BINARY
 	fflush(stdout);