- Fixed bug #53180 (post_max_size=0 not disabling the limit when the content

  type is application/x-www-form-urlencoded or is not registered with PHP).

diff --git a/NEWS b/NEWS
index 2631a90de1ecbf276666eba534e27b8eba415f6d..3c6a354a3ac16e0a4d53a0a2ca1e5bc1690359bc 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -44,6 +44,9 @@
 - Fixed ReflectionProperty::isDefault() giving a wrong result for properties
   obtained with ReflectionClass::getProperties(). (Gustavo)
 
+- Fixed bug #53180 (post_max_size=0 not disabling the limit when the content
+  type is application/x-www-form-urlencoded or is not registered with PHP).
+  (gm at tlink dot de, Gustavo)
 - Fixed bug #53144 (Segfault in SplObjectStorage::removeAll()). (Felipe)
 - Fixed bug #53071 (SPLObjectStorage defeats gc_collect_cycles). (Gustavo)
 - Fixed bug #53006 (stream_get_contents has an unpredictable behavior when the

diff --git a/main/SAPI.c b/main/SAPI.c
index 8593cd7d27ce5893990f4019c0d517d6209834f5..4a1605b0c51e6e36771c04e73442633499a4ea65 100644 (file)
--- a/main/SAPI.c
+++ b/main/SAPI.c
@@ -194,7 +194,7 @@ SAPI_API SAPI_POST_READER_FUNC(sapi_read_standard_form_data)
        int read_bytes;
        int allocated_bytes=SAPI_POST_BLOCK_SIZE+1;
 
-       if (SG(request_info).content_length > SG(post_max_size)) {
+       if ((SG(post_max_size) > 0) && (SG(request_info).content_length > SG(post_max_size))) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "POST Content-Length of %ld bytes exceeds the limit of %ld bytes",
                                        SG(request_info).content_length, SG(post_max_size));
                return;
@@ -207,7 +207,7 @@ SAPI_API SAPI_POST_READER_FUNC(sapi_read_standard_form_data)
                        break;
                }
                SG(read_post_bytes) += read_bytes;
-               if (SG(read_post_bytes) > SG(post_max_size)) {
+               if ((SG(post_max_size) > 0) && (SG(read_post_bytes) > SG(post_max_size))) {
                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "Actual POST length does not match Content-Length, and exceeds %ld bytes", SG(post_max_size));
                        break;
                }

diff --git a/tests/basic/bug53180.phpt b/tests/basic/bug53180.phpt
new file mode 100644 (file)
index 0000000..5c2eb76
--- /dev/null
+++ b/tests/basic/bug53180.phpt
@@ -0,0 +1,19 @@
+--TEST--\r
+Bug #53180 (post_max_size=0 partly not working)\r
+--INI--\r
+post_max_size=0\r
+--POST--\r
+email=foo&password=bar&submit=Log+on\r
+--FILE--\r
+<?php\r
+var_dump($_POST);\r
+?>\r
+--EXPECT--\r
+array(3) {\r
+  ["email"]=>\r
+  string(3) "foo"\r
+  ["password"]=>\r
+  string(3) "bar"\r
+  ["submit"]=>\r
+  string(6) "Log on"\r
+}\r