cvs: php-src /sapi/apache2handler sapi_apache2.c
| From: | Ilia Alshanetsky | Date: | Thu, 09 Nov 2006 19:10:27 +0000 |
| Subject: | cvs: php-src /sapi/apache2handler sapi_apache2.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-41428@lists.php.net to get a copy of this message | ||
iliaa Thu Nov 9 19:10:27 2006 UTC
Modified files:
/php-src/sapi/apache2handler sapi_apache2.c
Log:
MFB: 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.76&r2=1.77&diff_format=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.76
php-src/sapi/apache2handler/sapi_apache2.c:1.77
--- php-src/sapi/apache2handler/sapi_apache2.c:1.76 Thu Nov 9 00:13:39 2006
+++ php-src/sapi/apache2handler/sapi_apache2.c Thu Nov 9 19:10:27 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.76 2006/11/09 00:13:39 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.77 2006/11/09 19:10:27 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -569,7 +569,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;
}