From: Zeev Suraski <zeev@php.net>
Date: Sun, 9 May 1999 13:55:15 +0000 (+0000)
Subject: Several minor fixes
X-Git-Tag: BEFORE_PHP4_APACHE_MODULE_CHANGE~79
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5ba4b3311d90c546f12c13a3136a8d718a7d8d40;p=php

Several minor fixes
---

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 911d2fee86..471bb121fd 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -2164,6 +2164,7 @@ PHP_FUNCTION(function_exists)
 	pval *fname;
 	pval *tmp;
 	char *lcname;
+	CLS_FETCH();
 	
 	if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &fname)==FAILURE) {
 		WRONG_PARAM_COUNT;
@@ -2220,6 +2221,7 @@ PHP_FUNCTION(extract)
 	char *varname, *finalname;
 	ulong lkey;
 	int res, extype;
+	ELS_FETCH();
 
 	switch(ARG_COUNT(ht)) {
 		case 1:
diff --git a/main/main.c b/main/main.c
index a14dbbabcf..ef965528ff 100644
--- a/main/main.c
+++ b/main/main.c
@@ -662,7 +662,7 @@ void php_request_shutdown(void *dummy)
 	PLS_FETCH();
 	SLS_FETCH();
 
-	php3_header();
+	sapi_send_headers();
 	zend_end_ob_buffering(1);
 
 	php3_call_shutdown_functions();
@@ -1142,14 +1142,12 @@ PHPAPI void php_execute_script(zend_file_handle *primary_file CLS_DC ELS_DC PLS_
 
 			php4i_add_header_information(header_line, sizeof(CONTEXT_TYPE_IMAGE_GIF)-1);
 			PHPWRITE(php4_logo, sizeof(php4_logo));
-			efree(header_line);
 			return;
 		} else if (!strcmp(SG(request_info).query_string+1, "PHPE9568F35-D428-11d2-A769-00AA001ACF42")) {
 			char *header_line = estrndup(CONTEXT_TYPE_IMAGE_GIF, sizeof(CONTEXT_TYPE_IMAGE_GIF));
 
 			php4i_add_header_information(header_line, sizeof(CONTEXT_TYPE_IMAGE_GIF)-1);
 			PHPWRITE(zendtech_logo, sizeof(zendtech_logo));
-			efree(header_line);
 			return;
 		}
 	}