iliaa Wed Dec 14 03:36:44 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/sapi/apache2handler sapi_apache2.c
/php-src NEWS
Log:
Fixed bug #35571 (Fixed crash in Apache 2 SAPI when more then one php
script is loaded via SSI include).
http://cvs.php.net/viewcvs.cgi/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.57.2.7&r2=1.57.2.8&diff_format=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.7
php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.8
--- php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.7 Fri Nov 18 18:59:49 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c Wed Dec 14 03:36:43 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.57.2.7 2005/11/18 18:59:49 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.57.2.8 2005/12/14 03:36:43 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -471,7 +471,7 @@
/* apply_config() needs r in some cases, so allocate server_context
early */
ctx = SG(server_context);
- if (ctx == NULL) {
+ if (ctx == NULL || (ctx && ctx->request_processed &&
!strcmp(r->protocol, "INCLUDED"))) {
normal:
ctx = SG(server_context) = apr_pcalloc(r->pool, sizeof(*ctx));
/* register a cleanup so we clear out the SG(server_context)
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.291&r2=1.2027.2.292&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.291 php-src/NEWS:1.2027.2.292
--- php-src/NEWS:1.2027.2.291 Tue Dec 13 20:55:42 2005
+++ php-src/NEWS Wed Dec 14 03:36:44 2005
@@ -34,6 +34,8 @@
- Fixed bug #35612 (iis6 Access Violation crash). (Dmitry, alacn.uhahaa)
- Fixed bug #35594 (Multiple calls to getopt() may result in a crash).
(rabbitt at gmail dot com, Ilia)
+- Fixed bug #35571 (Fixed crash in Apache 2 SAPI when more then one php
+ script is loaded via SSI include). (Ilia)
- Fixed bug #35570 (segfault when re-using soap client object). (Dmitry)
- Fixed bug #35558 (mktime() interpreting 3 digit years incorrectly). (Ilia)
- Fixed bug #35543 (php crash when calling non existing method of a class
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
