]> granicus.if.org Git - php/commitdiff
init SG(server_context) before processing configs
authorStanislav Malyshev <stas@php.net>
Fri, 28 Nov 2008 23:22:39 +0000 (23:22 +0000)
committerStanislav Malyshev <stas@php.net>
Fri, 28 Nov 2008 23:22:39 +0000 (23:22 +0000)
sapi/apache/mod_php5.c

index 01eeeda3e71e247415af3c53552bc33ff0d5c529..4e7c448f6d8c68716973e30cd95a0d7482db2e36 100644 (file)
@@ -597,6 +597,8 @@ static int send_php(request_rec *r, int display_source_mode, char *filename)
                return OK;
        }
 
+       SG(server_context) = r;
+
        zend_first_try {
 
                /* Make sure file exists */
@@ -654,8 +656,6 @@ static int send_php(request_rec *r, int display_source_mode, char *filename)
                /* Init timeout */
                hard_timeout("send", r);
 
-               SG(server_context) = r;
-               
                php_save_umask();
                add_common_vars(r);
                add_cgi_vars(r);