From: Stanislav Malyshev <stas@php.net>
Date: Sat, 29 Nov 2008 00:45:31 +0000 (+0000)
Subject: MFB: init server context before config variables are processed
X-Git-Tag: php-5.3.0alpha2~43
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=09e37bc5ed2fda3c16702c6fe89880870b621e82;p=php

MFB: init server context before config variables are processed
---

diff --git a/sapi/apache/mod_php5.c b/sapi/apache/mod_php5.c
index bc65f6be57..8fe32faa67 100644
--- 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);