iliaa Thu Nov 9 19:10:56 2006 UTC
Modified files: (Branch: PHP_4_4)
/php-src/sapi/apache2handler sapi_apache2.c
/php-src NEWS
Log:
MFH: 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.1.2.40.2.10&r2=1.1.2.40.2.11&diff_format=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.40.2.10
php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.40.2.11
--- php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.40.2.10 Sun Jan 1
13:47:01 2006
+++ php-src/sapi/apache2handler/sapi_apache2.c Thu Nov 9 19:10:55 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.1.2.40.2.10 2006/01/01 13:47:01 sniper Exp $ */
+/* $Id: sapi_apache2.c,v 1.1.2.40.2.11 2006/11/09 19:10:55 iliaa Exp $ */
#include <fcntl.h>
@@ -551,7 +551,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.1247.2.920.2.172&r2=1.1247.2.920.2.173&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.172 php-src/NEWS:1.1247.2.920.2.173
--- php-src/NEWS:1.1247.2.920.2.172 Tue Nov 7 18:29:20 2006
+++ php-src/NEWS Thu Nov 9 19:10:56 2006
@@ -30,6 +30,8 @@
enabled. (Stefan E.)
- Fixed a memory corruption error with an invalid foreach() call. (Stefan E.,
Dmitry, Derick)
+- Fixed bug #38456 (Apache2 segfaults when virtual() is called in .php
+ ErrorDocument). (Ilia)
- Fixed bug #38431 (xmlrpc_get_type() crashes PHP on objects). (Tony)
- Fixed bug #38377 (session_destroy() gives warning after
session_regenerate_id()). (Ilia)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
