tony2001 Thu Aug 7 08:36:24 2008 UTC Modified files: (Branch: PHP_5_3) /ZendEngine2 zend_operators.c /php-src/ext/standard/tests/math bug45712.phpt Log: MFH: fix bug #45712 ($something == NaN returns true with 5.3, false with 5.2.*) http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_operators.c?r1=1.208.2.4.2.23.2.12&r2=1.208.2.4.2.23.2.13&diff_format=u Index: ZendEngine2/zend_operators.c diff -u ZendEngine2/zend_operators.c:1.208.2.4.2.23.2.12 ZendEngine2/zend_operators.c:1.208.2.4.2.23.2.13 --- ZendEngine2/zend_operators.c:1.208.2.4.2.23.2.12 Thu Jul 24 20:39:48 2008 +++ ZendEngine2/zend_operators.c Thu Aug 7 08:36:24 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_operators.c,v 1.208.2.4.2.23.2.12 2008/07/24 20:39:48 moriyoshi Exp $ */ +/* $Id: zend_operators.c,v 1.208.2.4.2.23.2.13 2008/08/07 08:36:24 tony2001 Exp $ */ #include <ctype.h> @@ -1383,15 +1383,18 @@ return SUCCESS; case TYPE_PAIR(IS_DOUBLE, IS_LONG): - ZVAL_LONG(result, Z_DVAL_P(op1)>((double)Z_LVAL_P(op2))?1:(Z_DVAL_P(op1)<((double)Z_LVAL_P(op2))?-1:0)); + Z_DVAL_P(result) = Z_DVAL_P(op1) - (double)Z_LVAL_P(op2); + ZVAL_LONG(result, ZEND_NORMALIZE_BOOL(Z_DVAL_P(result))); return SUCCESS; case TYPE_PAIR(IS_LONG, IS_DOUBLE): - ZVAL_LONG(result, ((double)Z_LVAL_P(op1))>Z_DVAL_P(op2)?1:(((double)Z_LVAL_P(op1))<Z_DVAL_P(op2)?-1:0)); + Z_DVAL_P(result) = (double)Z_LVAL_P(op1) - Z_DVAL_P(op2); + ZVAL_LONG(result, ZEND_NORMALIZE_BOOL(Z_DVAL_P(result))); return SUCCESS; case TYPE_PAIR(IS_DOUBLE, IS_DOUBLE): - ZVAL_LONG(result, Z_DVAL_P(op1)>Z_DVAL_P(op2)?1:(Z_DVAL_P(op1)<Z_DVAL_P(op2)?-1:0)); + Z_DVAL_P(result) = Z_DVAL_P(op1) - Z_DVAL_P(op2); + ZVAL_LONG(result, ZEND_NORMALIZE_BOOL(Z_DVAL_P(result))); return SUCCESS; case TYPE_PAIR(IS_ARRAY, IS_ARRAY): http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/bug45712.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/standard/tests/math/bug45712.phpt diff -u php-src/ext/standard/tests/math/bug45712.phpt:1.1.2.2 php-src/ext/standard/tests/math/bug45712.phpt:1.1.2.3 --- php-src/ext/standard/tests/math/bug45712.phpt:1.1.2.2 Tue Aug 5 12:36:47 2008 +++ php-src/ext/standard/tests/math/bug45712.phpt Thu Aug 7 08:36:24 2008 @@ -50,13 +50,13 @@ bool(false) bool(false) bool(false) -bool(true) bool(false) bool(false) bool(false) bool(false) bool(false) -bool(true) +bool(false) +bool(false) float(INF) bool(true) bool(false) @@ -64,7 +64,7 @@ bool(false) bool(false) bool(false) -bool(true) +bool(false) bool(false) bool(false) bool(false)
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php