iliaa           Sun Apr  1 19:09:36 2007 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src    NEWS 
    /php-src/main       php_content_types.c 
  Log:
  
  Fixed bug #40921 (php_default_post_reader crashes when post_max_size is
  exceeded).
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.617&r2=1.2027.2.547.2.618&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.617 php-src/NEWS:1.2027.2.547.2.618
--- php-src/NEWS:1.2027.2.547.2.617     Thu Mar 29 09:33:50 2007
+++ php-src/NEWS        Sun Apr  1 19:09:36 2007
@@ -37,6 +37,8 @@
 - Fixed zend_llist_remove_tail (Michael Wallner, Dmitry)
 - Fixed a thread safety issue in gd gif read code (Nuno, Roman Nemecek)
 - Fixed CVE-2007-1001, GD wbmp used with invalid image size (Pierre)
+- Fixed bug #40921 (php_default_post_reader crashes when post_max_size is
+  exceeded). (trickie at gmail dot com, Ilia)
 - Fixed bug #40915 (addcslashes unexpected behavior with binary input). (Tony)
 - Fixed bug #40899 (memory leak when nesting list()). (Dmitry)
 - Fixed bug #40883 (mysql_query() is allocating memory incorrectly). (Tony)
http://cvs.php.net/viewvc.cgi/php-src/main/php_content_types.c?r1=1.32.2.1.2.1&r2=1.32.2.1.2.2&diff_format=u
Index: php-src/main/php_content_types.c
diff -u php-src/main/php_content_types.c:1.32.2.1.2.1 
php-src/main/php_content_types.c:1.32.2.1.2.2
--- php-src/main/php_content_types.c:1.32.2.1.2.1       Mon Jan  1 09:36:11 2007
+++ php-src/main/php_content_types.c    Sun Apr  1 19:09:36 2007
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_content_types.c,v 1.32.2.1.2.1 2007/01/01 09:36:11 sebastian Exp $ 
*/
+/* $Id: php_content_types.c,v 1.32.2.1.2.2 2007/04/01 19:09:36 iliaa Exp $ */
 
 #include "php.h"
 #include "SAPI.h"
@@ -42,7 +42,7 @@
 
        /* $HTTP_RAW_POST_DATA registration */
        if(!strcmp(SG(request_info).request_method, "POST")) {
-               if(NULL == SG(request_info).post_entry) {
+               if(NULL == SG(request_info).post_entry && 
SG(request_info).post_data) {
                        /* no post handler registered, so we just swallow the 
data */
                        sapi_read_standard_form_data(TSRMLS_C);
                        length = SG(request_info).post_data_length;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to