From 7a67e94f179aaf9e5a67ec28988d1306ed39808c Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Fri, 28 Nov 2008 23:22:39 +0000 Subject: [PATCH] init SG(server_context) before processing configs --- sapi/apache/mod_php5.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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); -- 2.50.1