Imported Upstream version 5.2.4upstream/5.2.4

2 files changed, 41 insertions, 2 deletions

diff --git a/tests/basic/025.phpt b/tests/basic/025.phpt
index 2a3d5daf8..fea9468b4 100644
--- a/tests/basic/025.phpt
+++ b/tests/basic/025.phpt
@@ -13,7 +13,11 @@ a=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 var_dump($_POST, $HTTP_RAW_POST_DATA);
 ?>
 --EXPECTF--
-Notice: Undefined variable: HTTP_RAW_POST_DATA in %s/tests/basic/025.php on line 2
+Warning: Unknown: POST Content-Length of 2050 bytes exceeds the limit of 1024 bytes in Unknown on line 0
+
+Warning: Cannot modify header information - headers already sent in Unknown on line 0
+
+Notice: Undefined variable: HTTP_RAW_POST_DATA in %s on line %d
 array(0) {
 }
-NULL
\ No newline at end of file
+NULL
diff --git a/tests/basic/027.phpt b/tests/basic/027.phpt
new file mode 100644
index 000000000..248507b29
--- /dev/null
+++ b/tests/basic/027.phpt
@@ -0,0 +1,35 @@
+--TEST--
+Handling of max_input_nesting_level being reached
+--INI--
+magic_quotes_gpc=0
+always_populate_raw_post_data=0
+display_errors=0
+max_input_nesting_level=10
+track_errors=1
+log_errors=0
+--SKIPIF--
+<?php if (php_sapi_name()=='cli') echo 'skip'; ?>
+--POST--
+a=1&b=ZYX&c[][][][][][][][][][][][][][][][][][][][][][]=123&d=123&e[][]][]=3
+--FILE--
+<?php
+var_dump($_POST, $php_errormsg);
+?>
+--EXPECT--
+array(4) {
+  ["a"]=>
+  string(1) "1"
+  ["b"]=>
+  string(3) "ZYX"
+  ["d"]=>
+  string(3) "123"
+  ["e"]=>
+  array(1) {
+    [0]=>
+    array(1) {
+      [0]=>
+      string(1) "3"
+    }
+  }
+}
+string(115) "Unknown: Input variable nesting level exceeded 10. To increase the limit change max_input_nesting_level in php.ini."