- 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 df4d13de21dd199a1c736818410868ef65cf5471..79ca3d60736b2cac5cf81abf9b96c818f8f0b825 100644 (file)
--- 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 3988a9f330ddd8e3d028e5a4b7d2dfcdb3c12e63..e133769a69f807ec3de639c9611fb063741e2321 100644 (file)
--- 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;