MFB: init server context before config variables are processed

diff --git a/sapi/apache/mod_php5.c b/sapi/apache/mod_php5.c
index bc65f6be57b9c8a2af033cf1580ecf0faf8b64f4..8fe32faa6784977844a43ddb7446758331f986e0 100644 (file)
--- a/sapi/apache/mod_php5.c
+++ b/sapi/apache/mod_php5.c
@@ -613,6 +613,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 */
@@ -670,8 +672,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);