diff options
| author | Stanislav Malyshev <stas@php.net> | 2008-11-29 00:45:31 +0000 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2008-11-29 00:45:31 +0000 |
| commit | 09e37bc5ed2fda3c16702c6fe89880870b621e82 (patch) | |
| tree | afecd38e72e0d4d6e9cf27bf9bbbbc35b5b55b70 /sapi/apache/mod_php5.c | |
| parent | f1056a827c45f42a7435fb1a190aa6d4feb430b6 (diff) | |
| download | php-git-09e37bc5ed2fda3c16702c6fe89880870b621e82.tar.gz | |
MFB: init server context before config variables are processed
Diffstat (limited to 'sapi/apache/mod_php5.c')
| -rw-r--r-- | sapi/apache/mod_php5.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |