MFB: init server context before config variables are processed

diff --git a/sapi/apache/mod_php.c b/sapi/apache/mod_php.c
index ddde6d5927b872ac7d70dc252d8c163d70c6969b..9159f50a1530f63d1db161ab168cdc41458a3f9a 100644 (file)
--- a/sapi/apache/mod_php.c
+++ b/sapi/apache/mod_php.c
@@ -606,6 +606,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 */
@@ -663,8 +665,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);