MFB: init server context before config variables are processed

18 years ago · 09e37bc5ed
1 changed files with 2 additions and 2 deletions
--- 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);