mirror of
https://github.com/php/php-src.git
synced 2024-11-24 10:24:11 +08:00
Fixed bug #38456 (Apache2 segfaults when virtual() is called in .php
ErrorDocument).
This commit is contained in:
parent
fb06fa19e3
commit
b3006ed2a5
2
NEWS
2
NEWS
@ -49,6 +49,8 @@ PHP NEWS
|
||||
(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)
|
||||
|
||||
|
@ -574,7 +574,7 @@ zend_first_try {
|
||||
}
|
||||
|
||||
/* 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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user