iliaa Thu Nov 9 19:10:13 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/apache2handler sapi_apache2.c
/php-src NEWS
Log:
Fixed bug #38456 (Apache2 segfaults when virtual() is called in .php
ErrorDocument).
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.57.2.10.2.8&r2=1.57.2.10.2.9&diff_format=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.8
php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.9
--- php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.8 Thu Nov 9
00:13:26 2006
+++ php-src/sapi/apache2handler/sapi_apache2.c Thu Nov 9 19:10:12 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.57.2.10.2.8 2006/11/09 00:13:26 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.57.2.10.2.9 2006/11/09 19:10:12 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -574,7 +574,7 @@
}
/* check if comming due to ErrorDocument */
- if (parent_req && parent_req->status != HTTP_OK) {
+ if (parent_req && parent_req->status != HTTP_OK &&
strcmp(r->protocol, "INCLUDED")) {
parent_req = NULL;
goto normal;
}
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.342&r2=1.2027.2.547.2.343&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.342 php-src/NEWS:1.2027.2.547.2.343
--- php-src/NEWS:1.2027.2.547.2.342 Thu Nov 9 00:13:26 2006
+++ php-src/NEWS Thu Nov 9 19:10:13 2006
@@ -49,6 +49,8 @@
(Ilia)
- Fixed bug #38536 (SOAP returns an array of values instead of an object).
(Dmitry)
+- Fixed bug #38456 (Apache2 segfaults when virtual() is called in .php
+ ErrorDocument). (Ilia)
- Fixed bug #33282 (Re-assignment by reference does not clear the is_ref flag)
(Ilia,Dmitry, Matt Wilmas)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
