From: Stanislav Malyshev <stas@php.net>
Date: Fri, 28 Nov 2008 23:22:39 +0000 (+0000)
Subject: init SG(server_context) before processing configs
X-Git-Tag: php-5.2.8~29
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a67e94f179aaf9e5a67ec28988d1306ed39808c;p=php

init SG(server_context) before processing configs
---

diff --git a/sapi/apache/mod_php5.c b/sapi/apache/mod_php5.c
index 01eeeda3e7..4e7c448f6d 100644
--- a/sapi/apache/mod_php5.c
+++ b/sapi/apache/mod_php5.c
@@ -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);