Decouple DEBUG_FILE_UPLOAD from ZEND_DEBUG

nikic · nikic · commit 37b0dcc8e010 · 2016-08-19T00:34:13.000+02:00
Enabling ZEND_DEBUG should not result in intrusive program
behavior changes.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,9 @@`
`40`	`40`	`# define HAVE_ATOLL 1`
`41`	`41`	`#endif`
`42`	`42`
`43`		`-#define DEBUG_FILE_UPLOAD ZEND_DEBUG`
	`43`	`+#ifndef DEBUG_FILE_UPLOAD`
	`44`	`+# define DEBUG_FILE_UPLOAD 0`
	`45`	`+#endif`
`44`	`46`
`45`	`47`	`static int dummy_encoding_translation(void)`
`46`	`48`	`{`