clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #39201 (Possible crash in Apache 2 with 413 ErrorHandler).

Browse Source
This commit is contained in:
Ilia Alshanetsky 2006-12-13 00:41:33 +00:00
parent db87e11e6b
commit 1c4806c515
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
NEWS
View File

@ -125,14 +125,13 @@ PHP NEWS
- Fixed bug #39398 (Booleans are not automatically translated to integers).
(Ilia)
- Fixed bug #39366 (imagerotate does not use alpha with angle > 45°) (Pierre)
- Fixed bug #39362 (Added an option to imap_open/imap_reopen to control the
number of connection retries). (Ilia)
- Fixed bug #39350 (crash with implode("\n", array(false))). (Ilia)
- Fixed bug #39273 (imagecopyresized may ignore alpha channel) (Pierre)
- Fixed bug #39364 (Removed warning on empty haystack inside mb_strstr()).
(Ilia)
- Fixed bug #39362 (Added an option to imap_open/imap_reopen to control the
number of connection retries). (Ilia)
- Fixed bug #39354 (Allow building of curl extension against libcurl 7.16.0)
(Ilia)
- Fixed bug #39350 (crash with implode("\n", array(false))). (Ilia)
- Fixed bug #39344 (Unnecessary calls to OnModify callback routine for
an extension INI directive). (wharmby at uk dot ibm dot com, Dmitry)
- Fixed bug #39320 (ZEND_HASH_APPLY_STOP causes deletion). (Marcus)
@ -144,9 +143,12 @@ PHP NEWS
given) (Pierre)
- Fixed bug #39265 (Fixed path handling inside mod_files.sh).
(michal dot taborsky at gmail dot com, Ilia)
- Fixed bug #39273 (imagecopyresized may ignore alpha channel) (Pierre)
- Fixed bug #39217 (serialNumber might be -1 when the value is too large)
(Pierre, Tony)
- Fixed bug #39215 (Inappropriate close of stdin/stdout/stderr). (Wez,Ilia)
- Fixed bug #39201 (Possible crash in Apache 2 with 413 ErrorHandler).
(Ilia)
- Fixed bug #39151 (Parse error in recursiveiteratoriterator.php). (Marcus)
- Fixed bug #39121 (Incorrect return array handling in non-wsdl soap client).
(Dmitry)

9
sapi/apache2handler/sapi_apache2.c
View File

@ -587,8 +587,13 @@ zend_first_try {
}
}
/* check if comming due to ErrorDocument */
if (parent_req && parent_req->status != HTTP_OK && strcmp(r->protocol, "INCLUDED")) {
/*
* check if comming due to ErrorDocument
* We make a special exception of 413 (Invalid POST request) as the invalidity of the request occurs
* during processing of the request by PHP during POST processing. Therefor we need to re-use the exiting
* PHP instance to handle the request rather then creating a new one.
*/
if (parent_req && parent_req->status != HTTP_OK && parent_req->status != 413 && strcmp(r->protocol, "INCLUDED")) {
parent_req = NULL;
goto normal;
}