[PHP-CVS] svn: /php/php-src/trunk/Zend/ zend_operators.c
scottmac Sun, 22 Aug 2010 08:01:34 + Revision: http://svn.php.net/viewvc?view=revisionrevision=302629 Log: Fix a bug where two doubles are equal but the maths operation makes it appear false. Best example with INF where equals and identical produce different results. ?php var_dump(INF==INF); var_dump(INF===INF); Changed paths: U php/php-src/trunk/Zend/zend_operators.c Modified: php/php-src/trunk/Zend/zend_operators.c === --- php/php-src/trunk/Zend/zend_operators.c 2010-08-22 00:59:41 UTC (rev 302628) +++ php/php-src/trunk/Zend/zend_operators.c 2010-08-22 08:01:34 UTC (rev 302629) @@ -1410,8 +1410,12 @@ return SUCCESS; case TYPE_PAIR(IS_DOUBLE, IS_DOUBLE): - Z_DVAL_P(result) = Z_DVAL_P(op1) - Z_DVAL_P(op2); - ZVAL_LONG(result, ZEND_NORMALIZE_BOOL(Z_DVAL_P(result))); + if (Z_DVAL_P(op1) == Z_DVAL_P(op2)) { + ZVAL_LONG(result, 0); + } else { + 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): -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/trunk/Zend/ zend_operators.c
hi, test case? Thanks :) On Sun, Aug 22, 2010 at 10:01 AM, Scott MacVicar scott...@php.net wrote: scottmac Sun, 22 Aug 2010 08:01:34 + Revision: http://svn.php.net/viewvc?view=revisionrevision=302629 Log: Fix a bug where two doubles are equal but the maths operation makes it appear false. Best example with INF where equals and identical produce different results. ?php var_dump(INF==INF); var_dump(INF===INF); Changed paths: U php/php-src/trunk/Zend/zend_operators.c Modified: php/php-src/trunk/Zend/zend_operators.c === --- php/php-src/trunk/Zend/zend_operators.c 2010-08-22 00:59:41 UTC (rev 302628) +++ php/php-src/trunk/Zend/zend_operators.c 2010-08-22 08:01:34 UTC (rev 302629) @@ -1410,8 +1410,12 @@ return SUCCESS; case TYPE_PAIR(IS_DOUBLE, IS_DOUBLE): - Z_DVAL_P(result) = Z_DVAL_P(op1) - Z_DVAL_P(op2); - ZVAL_LONG(result, ZEND_NORMALIZE_BOOL(Z_DVAL_P(result))); + if (Z_DVAL_P(op1) == Z_DVAL_P(op2)) { + ZVAL_LONG(result, 0); + } else { + 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): -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- Pierre @pierrejoye | http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/iconv/ iconv.c
iliaaSun, 22 Aug 2010 18:17:19 + Revision: http://svn.php.net/viewvc?view=revisionrevision=302642 Log: Fixed bogus char Changed paths: U php/php-src/trunk/ext/iconv/iconv.c Modified: php/php-src/trunk/ext/iconv/iconv.c === --- php/php-src/trunk/ext/iconv/iconv.c 2010-08-22 18:14:39 UTC (rev 302641) +++ php/php-src/trunk/ext/iconv/iconv.c 2010-08-22 18:17:19 UTC (rev 302642) @@ -276,7 +276,7 @@ return FAILURE; } - php_output_handler_alias_register(ZEND_STRL(ob_iconv_handler�), php_iconv_output_handler_init TSRMLS_CC); + php_output_handler_alias_register(ZEND_STRL(ob_iconv_handler), php_iconv_output_handler_init TSRMLS_CC); php_output_handler_conflict_register(ZEND_STRL(ob_iconv_handler), php_iconv_output_conflict TSRMLS_CC); return SUCCESS; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/iconv/iconv.c trunk/ext/iconv/iconv.c
Thanks, I just applied a fix for that. On Thu, Aug 19, 2010 at 9:56 AM, Kalle Sommer Nielsen ka...@php.net wrote: Hi Ilia 2010/8/19 Ilia Alshanetsky il...@php.net: - php_output_handler_alias_register(ZEND_STRL(ob_iconv_handler), php_iconv_output_handler_init TSRMLS_CC); + php_output_handler_alias_register(ZEND_STRL(ob_iconv_handlerÂ), php_iconv_output_handler_init TSRMLS_CC); php_output_handler_conflict_register(ZEND_STRL(ob_iconv_handler), php_iconv_output_conflict TSRMLS_CC); This doesn't look correct, or is it just me? -- regards, Kalle Sommer Nielsen ka...@php.net -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php