stas Fri Nov 28 23:22:39 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/apache mod_php5.c
Log:
init SG(server_context) before processing configs
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/mod_php5.c?r1=1.19.2.7.2.15&r2=1.19.2.7.2.16&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.15
php-src/sapi/apache/mod_php5.c:1.19.2.7.2.16
--- php-src/sapi/apache/mod_php5.c:1.19.2.7.2.15 Mon Nov 24 22:18:25 2008
+++ php-src/sapi/apache/mod_php5.c Fri Nov 28 23:22:39 2008
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php5.c,v 1.19.2.7.2.15 2008/11/24 22:18:25 stas Exp $ */
+/* $Id: mod_php5.c,v 1.19.2.7.2.16 2008/11/28 23:22:39 stas Exp $ */
#include "php_apache_http.h"
#include "http_conf_globals.h"
@@ -597,6 +597,8 @@
return OK;
}
+ SG(server_context) = r;
+
zend_first_try {
/* Make sure file exists */
@@ -654,8 +656,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
