svn: /php/php-src/ branches/PHP_5_3/ext/spl/spl_iterators.c trunk/ext/spl/spl_iterators.c
| From: | Felipe Pena | Date: | Sun, 20 Feb 2011 16:09:50 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/ext/spl/spl_iterators.c trunk/ext/spl/spl_iterators.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-64577@lists.php.net to get a copy of this message | ||
felipe Sun, 20 Feb 2011 16:09:50 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=308503
Log:
- Fixed bug #54040 (Logical && where & probably needed in spl_iterators)
Bug: http://bugs.php.net/54040 (Open) Logical &&
where & probably needed in spl_iterators.c
Changed paths:
U php/php-src/branches/PHP_5_3/ext/spl/spl_iterators.c
U php/php-src/trunk/ext/spl/spl_iterators.c
Modified: php/php-src/branches/PHP_5_3/ext/spl/spl_iterators.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/spl/spl_iterators.c 2011-02-20 14:59:43 UTC (rev 308502)
+++ php/php-src/branches/PHP_5_3/ext/spl/spl_iterators.c 2011-02-20 16:09:50 UTC (rev 308503)
@@ -2739,7 +2739,7 @@
zend_throw_exception(spl_ce_InvalidArgumentException, "Unsetting flag TOSTRING_USE_INNER is
not possible", 0 TSRMLS_CC);
return;
}
- if ((flags && CIT_FULL_CACHE) != 0 && (intern->u.caching.flags &
CIT_FULL_CACHE) == 0) {
+ if ((flags & CIT_FULL_CACHE) != 0 && (intern->u.caching.flags & CIT_FULL_CACHE)
== 0) {
/* clear on (re)enable */
zend_hash_clean(HASH_OF(intern->u.caching.zcache));
}
Modified: php/php-src/trunk/ext/spl/spl_iterators.c
===================================================================
--- php/php-src/trunk/ext/spl/spl_iterators.c 2011-02-20 14:59:43 UTC (rev 308502)
+++ php/php-src/trunk/ext/spl/spl_iterators.c 2011-02-20 16:09:50 UTC (rev 308503)
@@ -2753,7 +2753,7 @@
zend_throw_exception(spl_ce_InvalidArgumentException, "Unsetting flag TOSTRING_USE_INNER is
not possible", 0 TSRMLS_CC);
return;
}
- if ((flags && CIT_FULL_CACHE) != 0 && (intern->u.caching.flags &
CIT_FULL_CACHE) == 0) {
+ if ((flags & CIT_FULL_CACHE) != 0 && (intern->u.caching.flags & CIT_FULL_CACHE)
== 0) {
/* clear on (re)enable */
zend_hash_clean(HASH_OF(intern->u.caching.zcache));
}