iliaa Wed Dec 13 00:41:33 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/apache2handler sapi_apache2.c
/php-src NEWS
Log:
Fixed bug #39201 (Possible crash in Apache 2 with 413 ErrorHandler).
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.57.2.10.2.10&r2=1.57.2.10.2.11&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.10
php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.11
--- php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.10 Tue Dec 12
18:05:25 2006
+++ php-src/sapi/apache2handler/sapi_apache2.c Wed Dec 13 00:41:33 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.57.2.10.2.10 2006/12/12 18:05:25 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.57.2.10.2.11 2006/12/13 00:41:33 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -587,8 +587,13 @@
}
}
- /* 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;
}
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.427&r2=1.2027.2.547.2.428&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.427 php-src/NEWS:1.2027.2.547.2.428
--- php-src/NEWS:1.2027.2.547.2.427 Tue Dec 12 18:05:25 2006
+++ php-src/NEWS Wed Dec 13 00:41:33 2006
@@ -125,14 +125,13 @@
- 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 @@
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)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
