derick Wed Mar 24 08:31:20 2004 EDT Modified files: /php-src NEWS /ZendEngine2 zend_operators.c /php-src/main rfc1867.c Log: - Fixed NEWS #- Can we *please* keep this in order? http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1654&r2=1.1655&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1654 php-src/NEWS:1.1655 --- php-src/NEWS:1.1654 Wed Mar 24 08:16:06 2004 +++ php-src/NEWS Wed Mar 24 08:31:17 2004 @@ -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) http://cvs.php.net/diff.php/ZendEngine2/zend_operators.c?r1=1.185&r2=1.186&ty=u Index: ZendEngine2/zend_operators.c diff -u ZendEngine2/zend_operators.c:1.185 ZendEngine2/zend_operators.c:1.186 --- ZendEngine2/zend_operators.c:1.185 Wed Mar 17 04:25:52 2004 +++ ZendEngine2/zend_operators.c Wed Mar 24 08:31:19 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_operators.c,v 1.185 2004/03/17 09:25:52 andi Exp $ */ +/* $Id: zend_operators.c,v 1.186 2004/03/24 13:31:19 derick Exp $ */ #include <ctype.h> @@ -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 @@ 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 @@ 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; http://cvs.php.net/diff.php/php-src/main/rfc1867.c?r1=1.151&r2=1.152&ty=u Index: php-src/main/rfc1867.c diff -u php-src/main/rfc1867.c:1.151 php-src/main/rfc1867.c:1.152 --- php-src/main/rfc1867.c:1.151 Thu Feb 12 13:27:33 2004 +++ php-src/main/rfc1867.c Wed Mar 24 08:31:20 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: rfc1867.c,v 1.151 2004/02/12 18:27:33 sesser Exp $ */ +/* $Id: rfc1867.c,v 1.152 2004/03/24 13:31:20 derick Exp $ */ /* * This product includes software developed by the Apache Group @@ -957,16 +957,22 @@ 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;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php