com php-src: Decouple DEBUG_FILE_UPLOAD from ZEND_DEB UG: main/rfc1867.c tests/basic/rfc1867 _anonymous_upload.phpt tests/basic/rfc1867_ar
ray_upload.phpt tests/basic/rfc1867_boundary_ 1.phpt tests/basic/rfc1867_boundary_2.php t tests/basic/rfc1867_empty_upload.phpt tests
/basic/rfc1867_file_upload_disabled.phpt test s/basic/rfc1867_garbled_mime_headers.phpt tes ts/basic/rfc1867_invalid_boundary.phpt tests/ba
sic/rfc1867_malicious_input.phpt tests/basic/r
| From: | Nikita Popov | Date: | Thu, 18 Aug 2016 22:34:13 +0000 |
| Subject: | com php-src: Decouple DEBUG_FILE_UPLOAD from ZEND_DEB UG: main/rfc1867.c tests/basic/rfc1867 _anonymous_upload.phpt tests/basic/rfc1867_ar ray_upload.phpt tests/basic/rfc1867_boundary_ 1.phpt tests/basic/rfc1867_boundary_2.php t tests/basic/rfc1867_empty_upload.phpt tests /basic/rfc1867_file_upload_disabled.phpt test s/basic/rfc1867_garbled_mime_headers.phpt tes ts/basic/rfc1867_invalid_boundary.phpt tests/ba sic/rfc1867_malicious_input.phpt tests/basic/r |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93980@lists.php.net to get a copy of this message | ||
Commit: 37b0dcc8e01085e5a93b0dfcf79f8e87bcb9c3fe
Author: Nikita Popov <nikic@php.net> Fri, 19 Aug 2016 00:12:27 +0200
Parents: cf40f999ba3a74acba1313cbf0a71c870de1ec8e
Branches: PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=37b0dcc8e01085e5a93b0dfcf79f8e87bcb9c3fe
Log:
Decouple DEBUG_FILE_UPLOAD from ZEND_DEBUG
Enabling ZEND_DEBUG should not result in intrusive program
behavior changes.
Changed paths:
M main/rfc1867.c
M tests/basic/rfc1867_anonymous_upload.phpt
M tests/basic/rfc1867_array_upload.phpt
M tests/basic/rfc1867_boundary_1.phpt
M tests/basic/rfc1867_boundary_2.phpt
M tests/basic/rfc1867_empty_upload.phpt
M tests/basic/rfc1867_file_upload_disabled.phpt
M tests/basic/rfc1867_garbled_mime_headers.phpt
M tests/basic/rfc1867_invalid_boundary.phpt
M tests/basic/rfc1867_malicious_input.phpt
M tests/basic/rfc1867_max_file_size.phpt
M tests/basic/rfc1867_max_file_uploads_empty_files.phpt
D tests/basic/rfc1867_max_file_uploads_empty_files_debug.phpt
M tests/basic/rfc1867_missing_boundary.phpt
M tests/basic/rfc1867_missing_boundary_2.phpt
M tests/basic/rfc1867_post_max_filesize.phpt
M tests/basic/rfc1867_post_max_size.phpt
diff --git a/main/rfc1867.c b/main/rfc1867.c index 6aa6b5d..9cdaecc 100644 --- a/main/rfc1867.c +++ b/main/rfc1867.c @@ -40,7 +40,9 @@ # define HAVE_ATOLL 1 #endif -#define DEBUG_FILE_UPLOAD ZEND_DEBUG +#ifndef DEBUG_FILE_UPLOAD +# define DEBUG_FILE_UPLOAD 0 +#endif static int dummy_encoding_translation(void) { diff --git a/tests/basic/rfc1867_anonymous_upload.phpt b/tests/basic/rfc1867_anonymous_upload.phpt index ce1f447..361bbbc 100644 --- a/tests/basic/rfc1867_anonymous_upload.phpt +++ b/tests/basic/rfc1867_anonymous_upload.phpt @@ -2,8 +2,6 @@ rfc1867 anonymous upload --INI-- 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-- diff --git a/tests/basic/rfc1867_array_upload.phpt b/tests/basic/rfc1867_array_upload.phpt index d9f9353..bbaa5c8 100644 --- a/tests/basic/rfc1867_array_upload.phpt +++ b/tests/basic/rfc1867_array_upload.phpt @@ -2,8 +2,6 @@ rfc1867 array upload --INI-- 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-- diff --git a/tests/basic/rfc1867_boundary_1.phpt b/tests/basic/rfc1867_boundary_1.phpt index fe0a9f2..e532120 100644 --- a/tests/basic/rfc1867_boundary_1.phpt +++ b/tests/basic/rfc1867_boundary_1.phpt @@ -2,8 +2,6 @@ rfc1867 boundary 1 --INI-- post_max_size=1024 -error_reporting=E_ALL&~E_NOTICE -comment=debug builds show some additional E_NOTICE errors --POST_RAW-- Content-Type: multipart/form-data; boundary="------------------------------------foobar" --------------------------------------foobar diff --git a/tests/basic/rfc1867_boundary_2.phpt b/tests/basic/rfc1867_boundary_2.phpt index 256ec4b..88f213f 100644 --- a/tests/basic/rfc1867_boundary_2.phpt +++ b/tests/basic/rfc1867_boundary_2.phpt @@ -2,8 +2,6 @@ rfc1867 boundary 2 --INI-- post_max_size=1024 -error_reporting=E_ALL&~E_NOTICE -comment=debug builds show some additional E_NOTICE errors --POST_RAW-- Content-Type: multipart/form-data; boundary=------------------------------------foo, bar --------------------------------------foo diff --git a/tests/basic/rfc1867_empty_upload.phpt b/tests/basic/rfc1867_empty_upload.phpt index c2dcb9b..039d994 100644 --- a/tests/basic/rfc1867_empty_upload.phpt +++ b/tests/basic/rfc1867_empty_upload.phpt @@ -2,8 +2,6 @@ rfc1867 empty upload --INI-- 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-- diff --git a/tests/basic/rfc1867_file_upload_disabled.phpt b/tests/basic/rfc1867_file_upload_disabled.phpt index 99dee9b..aa4b5ee 100644 --- a/tests/basic/rfc1867_file_upload_disabled.phpt +++ b/tests/basic/rfc1867_file_upload_disabled.phpt @@ -2,8 +2,6 @@ rfc1867 file_upload disabled --INI-- file_uploads=0 -error_reporting=E_ALL&~E_NOTICE -comment=debug builds show some additional E_NOTICE errors --POST_RAW-- Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737 -----------------------------20896060251896012921717172737 diff --git a/tests/basic/rfc1867_garbled_mime_headers.phpt b/tests/basic/rfc1867_garbled_mime_headers.phpt index 4010f22..a6c0425 100644 --- a/tests/basic/rfc1867_garbled_mime_headers.phpt +++ b/tests/basic/rfc1867_garbled_mime_headers.phpt @@ -2,8 +2,6 @@ rfc1867 garbled mime headers --INI-- file_uploads=1 -error_reporting=E_ALL&~E_NOTICE -comment=debug builds show some additional E_NOTICE errors upload_max_filesize=1024 --POST_RAW-- Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737 diff --git a/tests/basic/rfc1867_invalid_boundary.phpt b/tests/basic/rfc1867_invalid_boundary.phpt index cb27675..3b63b27 100644 --- a/tests/basic/rfc1867_invalid_boundary.phpt +++ b/tests/basic/rfc1867_invalid_boundary.phpt @@ -2,8 +2,6 @@ rfc1867 invalid boundary --INI-- post_max_size=1024 -error_reporting=E_ALL&~E_NOTICE -comment=debug builds show some additional E_NOTICE errors --POST_RAW-- Content-Type: multipart/form-data; boundary="foobar -----------------------------20896060251896012921717172737 diff --git a/tests/basic/rfc1867_malicious_input.phpt b/tests/basic/rfc1867_malicious_input.phpt index 40b43d2..98ed47c 100644 --- a/tests/basic/rfc1867_malicious_input.phpt +++ b/tests/basic/rfc1867_malicious_input.phpt @@ -2,8 +2,6 @@ rfc1867 malicious input --INI-- file_uploads=1 -error_reporting=E_ALL&~E_NOTICE -comment=debug builds show some additional E_NOTICE errors upload_max_filesize=1024 --POST_RAW-- Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737 diff --git a/tests/basic/rfc1867_max_file_size.phpt b/tests/basic/rfc1867_max_file_size.phpt index 9c576b4..1b7b9aa 100644 --- a/tests/basic/rfc1867_max_file_size.phpt +++ b/tests/basic/rfc1867_max_file_size.phpt @@ -2,8 +2,6 @@ rfc1867 MAX_FILE_SIZE --INI-- 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-- diff --git a/tests/basic/rfc1867_max_file_uploads_empty_files.phpt b/tests/basic/rfc1867_max_file_uploads_empty_files.phpt index 76327fd..4da55f2 100644 --- a/tests/basic/rfc1867_max_file_uploads_empty_files.phpt +++ b/tests/basic/rfc1867_max_file_uploads_empty_files.phpt @@ -1,10 +1,7 @@ --TEST-- -rfc1867 max_file_uploads - empty files shouldn't count (non-debug version) ---SKIPIF-- -<?php if(function_exists("leak")) print "skip only for non-debug builds"; ?> +rfc1867 max_file_uploads - empty files shouldn't count --INI-- file_uploads=1 -error_reporting=E_ALL max_file_uploads=2 --POST_RAW-- Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737 diff --git a/tests/basic/rfc1867_max_file_uploads_empty_files_debug.phpt b/tests/basic/rfc1867_max_file_uploads_empty_files_debug.phpt deleted file mode 100644 index 279851c..0000000 --- a/tests/basic/rfc1867_max_file_uploads_empty_files_debug.phpt +++ /dev/null @@ -1,102 +0,0 @@ ---TEST-- -rfc1867 max_file_uploads - empty files shouldn't count (debug version) ---SKIPIF-- -<?php if(!function_exists("leak")) print "skip only for debug builds"; ?> ---INI-- -file_uploads=1 -error_reporting=E_ALL -max_file_uploads=1 ---POST_RAW-- -Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737 ------------------------------20896060251896012921717172737 -Content-Disposition: form-data; name="file2"; filename="" -Content-Type: text/plain-file - - ------------------------------20896060251896012921717172737 -Content-Disposition: form-data; name="file3"; filename="" -Content-Type: text/plain-file - -33 ------------------------------20896060251896012921717172737 -Content-Disposition: form-data; name="file4"; filename="file4.txt" -Content-Type: text/plain-file - - ------------------------------20896060251896012921717172737 -Content-Disposition: form-data; name="file1"; filename="file1.txt" -Content-Type: text/plain-file - -1 ------------------------------20896060251896012921717172737-- ---FILE-- -<?php -var_dump($_FILES); -var_dump($_POST); -if (is_uploaded_file($_FILES["file1"]["tmp_name"])) { - var_dump(file_get_contents($_FILES["file1"]["tmp_name"])); -} -?> ---EXPECTF-- -Notice: No file uploaded in Unknown on line 0 - -Notice: No file uploaded in Unknown on line 0 - -Warning: Uploaded file size 0 - file [file4=file4.txt] not saved in Unknown on line 0 -array(4) { - ["file2"]=> - array(5) { - ["name"]=> - string(0) "" - ["type"]=> - string(0) "" - ["tmp_name"]=> - string(0) "" - ["error"]=> - int(4) - ["size"]=> - int(0) - } - ["file3"]=> - array(5) { - ["name"]=> - string(0) "" - ["type"]=> - string(0) "" - ["tmp_name"]=> - string(0) "" - ["error"]=> - int(4) - ["size"]=> - int(0) - } - ["file4"]=> - array(5) { - ["name"]=> - string(9) "file4.txt" - ["type"]=> - string(0) "" - ["tmp_name"]=> - string(0) "" - ["error"]=> - int(5) - ["size"]=> - int(0) - } - ["file1"]=> - array(5) { - ["name"]=> - string(9) "file1.txt" - ["type"]=> - string(15) "text/plain-file" - ["tmp_name"]=> - string(%d) "%s" - ["error"]=> - int(0) - ["size"]=> - int(1) - } -} -array(0) { -} -string(1) "1" diff --git a/tests/basic/rfc1867_missing_boundary.phpt b/tests/basic/rfc1867_missing_boundary.phpt index 6218b13..aadd1a8 100644 --- a/tests/basic/rfc1867_missing_boundary.phpt +++ b/tests/basic/rfc1867_missing_boundary.phpt @@ -2,8 +2,6 @@ rfc1867 missing boundary --INI-- post_max_size=1024 -error_reporting=E_ALL&~E_NOTICE -comment=debug builds show some additional E_NOTICE errors --POST_RAW-- Content-Type: multipart/form-data -----------------------------20896060251896012921717172737 diff --git a/tests/basic/rfc1867_missing_boundary_2.phpt b/tests/basic/rfc1867_missing_boundary_2.phpt index a8f38ae..1c4581c 100644 --- a/tests/basic/rfc1867_missing_boundary_2.phpt +++ b/tests/basic/rfc1867_missing_boundary_2.phpt @@ -2,8 +2,6 @@ rfc1867 missing boundary 2 --INI-- file_uploads=1 -error_reporting=E_ALL&~E_NOTICE -comment=debug builds show some additional E_NOTICE errors upload_max_filesize=1024 --POST_RAW-- Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737 diff --git a/tests/basic/rfc1867_post_max_filesize.phpt b/tests/basic/rfc1867_post_max_filesize.phpt index 04c0c5c..da851c4 100644 --- a/tests/basic/rfc1867_post_max_filesize.phpt +++ b/tests/basic/rfc1867_post_max_filesize.phpt @@ -2,8 +2,6 @@ rfc1867 post_max_filesize --INI-- 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-- diff --git a/tests/basic/rfc1867_post_max_size.phpt b/tests/basic/rfc1867_post_max_size.phpt index 9228135..eba547c 100644 --- a/tests/basic/rfc1867_post_max_size.phpt +++ b/tests/basic/rfc1867_post_max_size.phpt @@ -2,8 +2,6 @@ rfc1867 post_max_size --INI-- post_max_size=1 -error_reporting=E_ALL&~E_NOTICE -comment=debug builds show some additional E_NOTICE errors --POST_RAW-- Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737 -----------------------------20896060251896012921717172737
diff --git a/main/rfc1867.c b/main/rfc1867.c index 6aa6b5d..9cdaecc 100644 --- a/main/rfc1867.c +++ b/main/rfc1867.c @@ -40,7 +40,9 @@ # define HAVE_ATOLL 1 #endif -#define DEBUG_FILE_UPLOAD ZEND_DEBUG +#ifndef DEBUG_FILE_UPLOAD +# define DEBUG_FILE_UPLOAD 0 +#endif static int dummy_encoding_translation(void) { diff --git a/tests/basic/rfc1867_anonymous_upload.phpt b/tests/basic/rfc1867_anonymous_upload.phpt index ce1f447..361bbbc 100644 --- a/tests/basic/rfc1867_anonymous_upload.phpt +++ b/tests/basic/rfc1867_anonymous_upload.phpt @@ -2,8 +2,6 @@ rfc1867 anonymous upload --INI-- 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-- diff --git a/tests/basic/rfc1867_array_upload.phpt b/tests/basic/rfc1867_array_upload.phpt index d9f9353..bbaa5c8 100644 --- a/tests/basic/rfc1867_array_upload.phpt +++ b/tests/basic/rfc1867_array_upload.phpt @@ -2,8 +2,6 @@ rfc1867 array upload --INI-- 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-- diff --git a/tests/basic/rfc1867_boundary_1.phpt b/tests/basic/rfc1867_boundary_1.phpt index fe0a9f2..e532120 100644 --- a/tests/basic/rfc1867_boundary_1.phpt +++ b/tests/basic/rfc1867_boundary_1.phpt @@ -2,8 +2,6 @@ rfc1867 boundary 1 --INI-- post_max_size=1024 -error_reporting=E_ALL&~E_NOTICE -comment=debug builds show some additional E_NOTICE errors --POST_RAW-- Content-Type: multipart/form-data; boundary="------------------------------------foobar" --------------------------------------foobar diff --git a/tests/basic/rfc1867_boundary_2.phpt b/tests/basic/rfc1867_boundary_2.phpt index 256ec4b..88f213f 100644 --- a/tests/basic/rfc1867_boundary_2.phpt +++ b/tests/basic/rfc1867_boundary_2.phpt @@ -2,8 +2,6 @@ rfc1867 boundary 2 --INI-- post_max_size=1024 -error_reporting=E_ALL&~E_NOTICE -comment=debug builds show some additional E_NOTICE errors --POST_RAW-- Content-Type: multipart/form-data; boundary=------------------------------------foo, bar --------------------------------------foo diff --git a/tests/basic/rfc1867_empty_upload.phpt b/tests/basic/rfc1867_empty_upload.phpt index c2dcb9b..039d994 100644 --- a/tests/basic/rfc1867_empty_upload.phpt +++ b/tests/basic/rfc1867_empty_upload.phpt @@ -2,8 +2,6 @@ rfc1867 empty upload --INI-- 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-- diff --git a/tests/basic/rfc1867_file_upload_disabled.phpt b/tests/basic/rfc1867_file_upload_disabled.phpt index 99dee9b..aa4b5ee 100644 --- a/tests/basic/rfc1867_file_upload_disabled.phpt +++ b/tests/basic/rfc1867_file_upload_disabled.phpt @@ -2,8 +2,6 @@ rfc1867 file_upload disabled --INI-- file_uploads=0 -error_reporting=E_ALL&~E_NOTICE -comment=debug builds show some additional E_NOTICE errors --POST_RAW-- Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737 -----------------------------20896060251896012921717172737 diff --git a/tests/basic/rfc1867_garbled_mime_headers.phpt b/tests/basic/rfc1867_garbled_mime_headers.phpt index 4010f22..a6c0425 100644 --- a/tests/basic/rfc1867_garbled_mime_headers.phpt +++ b/tests/basic/rfc1867_garbled_mime_headers.phpt @@ -2,8 +2,6 @@ rfc1867 garbled mime headers --INI-- file_uploads=1 -error_reporting=E_ALL&~E_NOTICE -comment=debug builds show some additional E_NOTICE errors upload_max_filesize=1024 --POST_RAW-- Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737 diff --git a/tests/basic/rfc1867_invalid_boundary.phpt b/tests/basic/rfc1867_invalid_boundary.phpt index cb27675..3b63b27 100644 --- a/tests/basic/rfc1867_invalid_boundary.phpt +++ b/tests/basic/rfc1867_invalid_boundary.phpt @@ -2,8 +2,6 @@ rfc1867 invalid boundary --INI-- post_max_size=1024 -error_reporting=E_ALL&~E_NOTICE -comment=debug builds show some additional E_NOTICE errors --POST_RAW-- Content-Type: multipart/form-data; boundary="foobar -----------------------------20896060251896012921717172737 diff --git a/tests/basic/rfc1867_malicious_input.phpt b/tests/basic/rfc1867_malicious_input.phpt index 40b43d2..98ed47c 100644 --- a/tests/basic/rfc1867_malicious_input.phpt +++ b/tests/basic/rfc1867_malicious_input.phpt @@ -2,8 +2,6 @@ rfc1867 malicious input --INI-- file_uploads=1 -error_reporting=E_ALL&~E_NOTICE -comment=debug builds show some additional E_NOTICE errors upload_max_filesize=1024 --POST_RAW-- Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737 diff --git a/tests/basic/rfc1867_max_file_size.phpt b/tests/basic/rfc1867_max_file_size.phpt index 9c576b4..1b7b9aa 100644 --- a/tests/basic/rfc1867_max_file_size.phpt +++ b/tests/basic/rfc1867_max_file_size.phpt @@ -2,8 +2,6 @@ rfc1867 MAX_FILE_SIZE --INI-- 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-- diff --git a/tests/basic/rfc1867_max_file_uploads_empty_files.phpt b/tests/basic/rfc1867_max_file_uploads_empty_files.phpt index 76327fd..4da55f2 100644 --- a/tests/basic/rfc1867_max_file_uploads_empty_files.phpt +++ b/tests/basic/rfc1867_max_file_uploads_empty_files.phpt @@ -1,10 +1,7 @@ --TEST-- -rfc1867 max_file_uploads - empty files shouldn't count (non-debug version) ---SKIPIF-- -<?php if(function_exists("leak")) print "skip only for non-debug builds"; ?> +rfc1867 max_file_uploads - empty files shouldn't count --INI-- file_uploads=1 -error_reporting=E_ALL max_file_uploads=2 --POST_RAW-- Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737 diff --git a/tests/basic/rfc1867_max_file_uploads_empty_files_debug.phpt b/tests/basic/rfc1867_max_file_uploads_empty_files_debug.phpt deleted file mode 100644 index 279851c..0000000 --- a/tests/basic/rfc1867_max_file_uploads_empty_files_debug.phpt +++ /dev/null @@ -1,102 +0,0 @@ ---TEST-- -rfc1867 max_file_uploads - empty files shouldn't count (debug version) ---SKIPIF-- -<?php if(!function_exists("leak")) print "skip only for debug builds"; ?> ---INI-- -file_uploads=1 -error_reporting=E_ALL -max_file_uploads=1 ---POST_RAW-- -Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737 ------------------------------20896060251896012921717172737 -Content-Disposition: form-data; name="file2"; filename="" -Content-Type: text/plain-file - - ------------------------------20896060251896012921717172737 -Content-Disposition: form-data; name="file3"; filename="" -Content-Type: text/plain-file - -33 ------------------------------20896060251896012921717172737 -Content-Disposition: form-data; name="file4"; filename="file4.txt" -Content-Type: text/plain-file - - ------------------------------20896060251896012921717172737 -Content-Disposition: form-data; name="file1"; filename="file1.txt" -Content-Type: text/plain-file - -1 ------------------------------20896060251896012921717172737-- ---FILE-- -<?php -var_dump($_FILES); -var_dump($_POST); -if (is_uploaded_file($_FILES["file1"]["tmp_name"])) { - var_dump(file_get_contents($_FILES["file1"]["tmp_name"])); -} -?> ---EXPECTF-- -Notice: No file uploaded in Unknown on line 0 - -Notice: No file uploaded in Unknown on line 0 - -Warning: Uploaded file size 0 - file [file4=file4.txt] not saved in Unknown on line 0 -array(4) { - ["file2"]=> - array(5) { - ["name"]=> - string(0) "" - ["type"]=> - string(0) "" - ["tmp_name"]=> - string(0) "" - ["error"]=> - int(4) - ["size"]=> - int(0) - } - ["file3"]=> - array(5) { - ["name"]=> - string(0) "" - ["type"]=> - string(0) "" - ["tmp_name"]=> - string(0) "" - ["error"]=> - int(4) - ["size"]=> - int(0) - } - ["file4"]=> - array(5) { - ["name"]=> - string(9) "file4.txt" - ["type"]=> - string(0) "" - ["tmp_name"]=> - string(0) "" - ["error"]=> - int(5) - ["size"]=> - int(0) - } - ["file1"]=> - array(5) { - ["name"]=> - string(9) "file1.txt" - ["type"]=> - string(15) "text/plain-file" - ["tmp_name"]=> - string(%d) "%s" - ["error"]=> - int(0) - ["size"]=> - int(1) - } -} -array(0) { -} -string(1) "1" diff --git a/tests/basic/rfc1867_missing_boundary.phpt b/tests/basic/rfc1867_missing_boundary.phpt index 6218b13..aadd1a8 100644 --- a/tests/basic/rfc1867_missing_boundary.phpt +++ b/tests/basic/rfc1867_missing_boundary.phpt @@ -2,8 +2,6 @@ rfc1867 missing boundary --INI-- post_max_size=1024 -error_reporting=E_ALL&~E_NOTICE -comment=debug builds show some additional E_NOTICE errors --POST_RAW-- Content-Type: multipart/form-data -----------------------------20896060251896012921717172737 diff --git a/tests/basic/rfc1867_missing_boundary_2.phpt b/tests/basic/rfc1867_missing_boundary_2.phpt index a8f38ae..1c4581c 100644 --- a/tests/basic/rfc1867_missing_boundary_2.phpt +++ b/tests/basic/rfc1867_missing_boundary_2.phpt @@ -2,8 +2,6 @@ rfc1867 missing boundary 2 --INI-- file_uploads=1 -error_reporting=E_ALL&~E_NOTICE -comment=debug builds show some additional E_NOTICE errors upload_max_filesize=1024 --POST_RAW-- Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737 diff --git a/tests/basic/rfc1867_post_max_filesize.phpt b/tests/basic/rfc1867_post_max_filesize.phpt index 04c0c5c..da851c4 100644 --- a/tests/basic/rfc1867_post_max_filesize.phpt +++ b/tests/basic/rfc1867_post_max_filesize.phpt @@ -2,8 +2,6 @@ rfc1867 post_max_filesize --INI-- 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-- diff --git a/tests/basic/rfc1867_post_max_size.phpt b/tests/basic/rfc1867_post_max_size.phpt index 9228135..eba547c 100644 --- a/tests/basic/rfc1867_post_max_size.phpt +++ b/tests/basic/rfc1867_post_max_size.phpt @@ -2,8 +2,6 @@ rfc1867 post_max_size --INI-- post_max_size=1 -error_reporting=E_ALL&~E_NOTICE -comment=debug builds show some additional E_NOTICE errors --POST_RAW-- Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737 -----------------------------20896060251896012921717172737