stas            Sat Nov 29 00:46:27 2008 UTC

  Modified files:              
    /php-src/sapi/apache        mod_php.c 
  Log:
  MFB: init server context before config variables are processed
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/mod_php.c?r1=1.11&r2=1.12&diff_format=u
Index: php-src/sapi/apache/mod_php.c
diff -u php-src/sapi/apache/mod_php.c:1.11 php-src/sapi/apache/mod_php.c:1.12
--- php-src/sapi/apache/mod_php.c:1.11  Tue Nov 25 00:33:10 2008
+++ php-src/sapi/apache/mod_php.c       Sat Nov 29 00:46:27 2008
@@ -17,7 +17,7 @@
    | PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]>                      |
    +----------------------------------------------------------------------+
  */
-/* $Id: mod_php.c,v 1.11 2008/11/25 00:33:10 stas Exp $ */
+/* $Id: mod_php.c,v 1.12 2008/11/29 00:46:27 stas Exp $ */
 
 #include "php_apache_http.h"
 #include "http_conf_globals.h"
@@ -606,6 +606,8 @@
                return OK;
        }
 
+       SG(server_context) = r;
+
        zend_first_try {
 
                /* Make sure file exists */
@@ -663,8 +665,6 @@
                /* Init timeout */
                hard_timeout("send", r);
 
-               SG(server_context) = r;
-               
                php_save_umask();
                add_common_vars(r);
                add_cgi_vars(r);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to