Skip to content

Commit 09e37bc

Browse files
committed
MFB: init server context before config variables are processed
1 parent f1056a8 commit 09e37bc

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

sapi/apache/mod_php5.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -613,6 +613,8 @@ static int send_php(request_rec *r, int display_source_mode, char *filename)
613613
return OK;
614614
}
615615

616+
SG(server_context) = r;
617+
616618
zend_first_try {
617619

618620
/* Make sure file exists */
@@ -670,8 +672,6 @@ static int send_php(request_rec *r, int display_source_mode, char *filename)
670672
/* Init timeout */
671673
hard_timeout("send", r);
672674

673-
SG(server_context) = r;
674-
675675
php_save_umask();
676676
add_common_vars(r);
677677
add_cgi_vars(r);

0 commit comments

Comments
 (0)