From: Derick Rethans <derick@php.net>
Date: Thu, 25 Mar 2004 21:27:23 +0000 (+0000)
Subject: - Stopped file uploads from throwing E_WARNINGs and E_NOTICEs which can not be
X-Git-Tag: php-5.0.0RC2RC1~227
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fe576c7acb71763b63a8bd289a0c56d7da2f290a;p=php

- Stopped file uploads from throwing E_WARNINGs and E_NOTICEs which can not be
  hidden from within scripts (and a result value in the $_FILES global can be
  used to see the real failure anyway).
---

diff --git a/NEWS b/NEWS
index df4d13de21..79ca3d6073 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,9 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ????? 2004, PHP 5 Release Candidate 2
+- Stopped file uploads from throwing E_WARNINGs and E_NOTICEs which can not be
+  hidden from within scripts (and a result value in the $_FILES global can be
+  used to see the real failure anyway). (Derick)
 - Reimplement zend.ze1_compatibility_mode to have better PHP 4 complicance.
   (Dmitry, Andi)
 - Changed __construct() to always take precedence over old style constructor.
diff --git a/main/rfc1867.c b/main/rfc1867.c
index 3988a9f330..e133769a69 100644
--- a/main/rfc1867.c
+++ b/main/rfc1867.c
@@ -33,7 +33,7 @@
 #include "php_variables.h"
 #include "rfc1867.h"
 
-#undef DEBUG_FILE_UPLOAD
+#define DEBUG_FILE_UPLOAD ZEND_DEBUG
 
 #if HAVE_MBSTRING && !defined(COMPILE_DL_MBSTRING)
 #include "ext/mbstring/mbstring.h"
@@ -957,16 +957,22 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler)
 			while (!cancel_upload && (blen = multipart_buffer_read(mbuff, buff, sizeof(buff) TSRMLS_CC)))
 			{
 				if (PG(upload_max_filesize) > 0 && total_bytes > PG(upload_max_filesize)) {
-					sapi_module.sapi_error(E_WARNING, "upload_max_filesize of %ld bytes exceeded - file [%s=%s] not saved", PG(upload_max_filesize), param, filename);
+#ifdef DEBUG_FILE_UPLOAD
+					sapi_module.sapi_error(E_NOTICE, "upload_max_filesize of %ld bytes exceeded - file [%s=%s] not saved", PG(upload_max_filesize), param, filename);
+#endif
 					cancel_upload = UPLOAD_ERROR_A;
 				} else if (max_file_size && (total_bytes > max_file_size)) {
-					sapi_module.sapi_error(E_WARNING, "MAX_FILE_SIZE of %ld bytes exceeded - file [%s=%s] not saved", max_file_size, param, filename);
+#ifdef DEBUG_FILE_UPLOAD
+					sapi_module.sapi_error(E_NOTICE, "MAX_FILE_SIZE of %ld bytes exceeded - file [%s=%s] not saved", max_file_size, param, filename);
+#endif
 					cancel_upload = UPLOAD_ERROR_B;
 				} else if (blen > 0) {
 					wlen = fwrite(buff, 1, blen, fp);
 			
 					if (wlen < blen) {
-						sapi_module.sapi_error(E_WARNING, "Only %d bytes were written, expected to write %ld", wlen, blen);
+#ifdef DEBUG_FILE_UPLOAD
+						sapi_module.sapi_error(E_NOTICE, "Only %d bytes were written, expected to write %ld", wlen, blen);
+#endif
 						cancel_upload = UPLOAD_ERROR_C;
 					} else {
 						total_bytes += wlen;