stas            Sat Nov 29 00:45:31 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/sapi/apache        mod_php5.c 
  Log:
  MFB: init server context before config variables are processed
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/mod_php5.c?r1=1.19.2.7.2.13.2.9&r2=1.19.2.7.2.13.2.10&diff_format=u
Index: php-src/sapi/apache/mod_php5.c
diff -u php-src/sapi/apache/mod_php5.c:1.19.2.7.2.13.2.9 
php-src/sapi/apache/mod_php5.c:1.19.2.7.2.13.2.10
--- php-src/sapi/apache/mod_php5.c:1.19.2.7.2.13.2.9    Mon Nov 24 22:23:11 2008
+++ php-src/sapi/apache/mod_php5.c      Sat Nov 29 00:45:31 2008
@@ -17,7 +17,7 @@
    | PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]>                      |
    +----------------------------------------------------------------------+
  */
-/* $Id: mod_php5.c,v 1.19.2.7.2.13.2.9 2008/11/24 22:23:11 stas Exp $ */
+/* $Id: mod_php5.c,v 1.19.2.7.2.13.2.10 2008/11/29 00:45:31 stas Exp $ */
 
 #include "php_apache_http.h"
 #include "http_conf_globals.h"
@@ -613,6 +613,8 @@
                return OK;
        }
 
+       SG(server_context) = r;
+
        zend_first_try {
 
                /* Make sure file exists */
@@ -670,8 +672,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