Imported Upstream version 5.4.0~rc8upstream/5.4.0_rc8

11 files changed, 13 insertions, 0 deletions

diff --git a/tests/basic/022.phpt b/tests/basic/022.phpt
index 61718f216..64314ee9e 100644
--- a/tests/basic/022.phpt
+++ b/tests/basic/022.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Cookies test#1
+--INI--
+max_input_vars=1000
 --COOKIE--
 cookie1=val1  ; cookie2=val2%20; cookie3=val 3.; cookie 4= value 4 %3B; cookie1=bogus; %20cookie1=ignore;+cookie1=ignore;cookie1;cookie  5=%20 value; cookie%206=þæö;cookie+7=;$cookie.8;cookie-9=1;;;- & % $cookie 10=10
 --FILE--
diff --git a/tests/basic/023.phpt b/tests/basic/023.phpt
index 181745ea5..07fe9d6d3 100644
--- a/tests/basic/023.phpt
+++ b/tests/basic/023.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Cookies test#2
+--INI--
+max_input_vars=1000
 --COOKIE--
 c o o k i e=value; c o o k i e= v a l u e ;;c%20o+o k+i%20e=v;name="value","value",UEhQIQ==;UEhQIQ==foo
 --FILE--
diff --git a/tests/basic/024.phpt b/tests/basic/024.phpt
index 497d3514e..bf8a206b3 100644
--- a/tests/basic/024.phpt
+++ b/tests/basic/024.phpt
@@ -2,6 +2,7 @@
 Test HTTP_RAW_POST_DATA creation
 --INI--
 always_populate_raw_post_data=1
+max_input_vars=1000
 --POST--
 a=ABC&y=XYZ&c[]=1&c[]=2&c[a]=3
 --FILE--
diff --git a/tests/basic/027.phpt b/tests/basic/027.phpt
index aa001f65a..0528e835a 100644
--- a/tests/basic/027.phpt
+++ b/tests/basic/027.phpt
@@ -4,6 +4,7 @@ Handling of max_input_nesting_level being reached
 always_populate_raw_post_data=0
 display_errors=0
 max_input_nesting_level=10
+max_input_vars=1000
 track_errors=1
 log_errors=0
 --POST--
diff --git a/tests/basic/028.phpt b/tests/basic/028.phpt
index cadb25d8d..37d6f21a0 100644
--- a/tests/basic/028.phpt
+++ b/tests/basic/028.phpt
@@ -2,6 +2,7 @@
 RFC1867 character quotting
 --INI--
 file_uploads=1
+max_input_vars=1000
 --POST_RAW--
 Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737
 -----------------------------20896060251896012921717172737
diff --git a/tests/basic/bug55500.phpt b/tests/basic/bug55500.phpt
index 22bc131bc..97eeea2c8 100644
--- a/tests/basic/bug55500.phpt
+++ b/tests/basic/bug55500.phpt
@@ -4,6 +4,7 @@ Bug #55500 (Corrupted $_FILES indices lead to security concern)
 file_uploads=1
 error_reporting=E_ALL&~E_NOTICE
 upload_max_filesize=1024
+max_file_uploads=10
 --POST_RAW--
 Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737
 -----------------------------20896060251896012921717172737
diff --git a/tests/basic/rfc1867_anonymous_upload.phpt b/tests/basic/rfc1867_anonymous_upload.phpt
index 8a27e2e37..ce1f4479c 100644
--- a/tests/basic/rfc1867_anonymous_upload.phpt
+++ b/tests/basic/rfc1867_anonymous_upload.phpt
@@ -5,6 +5,7 @@ file_uploads=1
 error_reporting=E_ALL&~E_NOTICE
 comment=debug builds show some additional E_NOTICE errors
 upload_max_filesize=1024
+max_file_uploads=10
 --POST_RAW--
 Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737
 -----------------------------20896060251896012921717172737
diff --git a/tests/basic/rfc1867_array_upload.phpt b/tests/basic/rfc1867_array_upload.phpt
index 0b762c209..d9f93530c 100644
--- a/tests/basic/rfc1867_array_upload.phpt
+++ b/tests/basic/rfc1867_array_upload.phpt
@@ -5,6 +5,7 @@ file_uploads=1
 error_reporting=E_ALL&~E_NOTICE
 comment=debug builds show some additional E_NOTICE errors
 upload_max_filesize=1024
+max_file_uploads=10
 --POST_RAW--
 Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737
 -----------------------------20896060251896012921717172737
diff --git a/tests/basic/rfc1867_empty_upload.phpt b/tests/basic/rfc1867_empty_upload.phpt
index 12ab0fdf0..c2dcb9b2e 100644
--- a/tests/basic/rfc1867_empty_upload.phpt
+++ b/tests/basic/rfc1867_empty_upload.phpt
@@ -5,6 +5,7 @@ file_uploads=1
 error_reporting=E_ALL&~E_NOTICE
 comment=debug builds show some additional E_NOTICE errors
 upload_max_filesize=1024
+max_file_uploads=10
 --POST_RAW--
 Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737
 -----------------------------20896060251896012921717172737
diff --git a/tests/basic/rfc1867_max_file_size.phpt b/tests/basic/rfc1867_max_file_size.phpt
index fa7876fd1..9c576b477 100644
--- a/tests/basic/rfc1867_max_file_size.phpt
+++ b/tests/basic/rfc1867_max_file_size.phpt
@@ -5,6 +5,7 @@ file_uploads=1
 error_reporting=E_ALL&~E_NOTICE
 comment=debug builds show some additional E_NOTICE errors
 upload_max_filesize=1024
+max_file_uploads=10
 --POST_RAW--
 Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737
 -----------------------------20896060251896012921717172737
diff --git a/tests/basic/rfc1867_post_max_filesize.phpt b/tests/basic/rfc1867_post_max_filesize.phpt
index 62be6c299..04c0c5c2b 100644
--- a/tests/basic/rfc1867_post_max_filesize.phpt
+++ b/tests/basic/rfc1867_post_max_filesize.phpt
@@ -5,6 +5,7 @@ file_uploads=1
 error_reporting=E_ALL&~E_NOTICE
 comment=debug builds show some additional E_NOTICE errors
 upload_max_filesize=1
+max_file_uploads=10
 --POST_RAW--
 Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737
 -----------------------------20896060251896012921717172737