- Fixed NEWS

#- Can we *please* keep this in order?

diff --git a/NEWS b/NEWS
index c2ff6010521fead60fb2410760c54da6d40e4d60..557a309b74db0159775f25a3f74afcb1757028a8 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,10 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ????? 2004, PHP 5 Release Candidate 2
-- Fixed bug #27641 (Object cloning in ze1_compatibility_mode was reimplemented)
-  (Dmitry, Andi)
-- Changed sqlite's OO API to studlyCaps. (Marcus)
 - Fixed bug #27646 (Cannot serialize/unserialize non-finite numeric values).
   (Marcus)
+- Fixed bug #27641 (Object cloning in ze1_compatibility_mode was reimplemented)
+  (Dmitry, Andi)
 - Fixed bug #27628 (Simplify the process of making a POST request via stream
   context). (Ilia)
 - Fixed bug #27469 (serialize() objects of incomplete class). (Dmitry)

diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index cbc12356593ac87f5954b6710888412cca04a9ea..bb6bb68a30dd7c9c242c676e44c4de1168f57c57 100644 (file)
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -34,8 +34,6 @@
 #include "ext/bcmath/number.h"
 #endif
 
-#define LONG_SIGN_MASK (1L << (8*sizeof(long)-1))
-
 ZEND_API int zend_atoi(const char *str, int str_len)
 {
        int retval;
@@ -727,8 +725,8 @@ ZEND_API int add_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
                long lval = op1->value.lval + op2->value.lval;
                
                /* check for overflow by comparing sign bits */
-               if ( (op1->value.lval & LONG_SIGN_MASK) == (op2->value.lval & LONG_SIGN_MASK) 
-                       && (op1->value.lval & LONG_SIGN_MASK) != (lval & LONG_SIGN_MASK)) {
+               if ( (op1->value.lval & LONG_MIN) == (op2->value.lval & LONG_MIN) 
+                       && (op1->value.lval & LONG_MIN) != (lval & LONG_MIN)) {
 
                        result->value.dval = (double) op1->value.lval + (double) op2->value.lval;
                        result->type = IS_DOUBLE;
@@ -767,8 +765,8 @@ ZEND_API int sub_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
                long lval = op1->value.lval - op2->value.lval;
                
                /* check for overflow by comparing sign bits */
-               if ( (op1->value.lval & LONG_SIGN_MASK) != (op2->value.lval & LONG_SIGN_MASK) 
-                       && (op1->value.lval & LONG_SIGN_MASK) != (lval & LONG_SIGN_MASK)) {
+               if ( (op1->value.lval & LONG_MIN) != (op2->value.lval & LONG_MIN) 
+                       && (op1->value.lval & LONG_MIN) != (lval & LONG_MIN)) {
 
                        result->value.dval = (double) op1->value.lval - (double) op2->value.lval;
                        result->type = IS_DOUBLE;

diff --git a/main/rfc1867.c b/main/rfc1867.c
index 3988a9f330ddd8e3d028e5a4b7d2dfcdb3c12e63..1370f5b5a6a2119a798cde77f0ad24df616356c5 100644 (file)
--- a/main/rfc1867.c
+++ b/main/rfc1867.c
@@ -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;