Several minor fixes

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 911d2fee869973c84ebbb66dd81a32494c10d5c5..471bb121fd2b00d12ba6dd88933df8e48db27aa0 100644 (file)
--- 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 a14dbbabcf419d9570e2ed49070945d5bbba8876..ef965528ff4286951c73670c972c3434178d4e28 100644 (file)
--- 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;
                }
        }