felipe Tue, 27 Oct 2009 21:57:26 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=290002
Log: - Fixed bug #50018 (Typo in spl_limit_it_seek()) Bug: http://bugs.php.net/50018 (Open) Typo in spl_limit_it_seek() Changed paths: U php/php-src/branches/PHP_5_2/ext/spl/spl_iterators.c U php/php-src/branches/PHP_5_2/ext/spl/tests/iterator_032.phpt U php/php-src/branches/PHP_5_3/ext/spl/spl_iterators.c U php/php-src/branches/PHP_5_3/ext/spl/tests/iterator_032.phpt U php/php-src/trunk/ext/spl/spl_iterators.c U php/php-src/trunk/ext/spl/tests/iterator_032.phpt Modified: php/php-src/branches/PHP_5_2/ext/spl/spl_iterators.c =================================================================== --- php/php-src/branches/PHP_5_2/ext/spl/spl_iterators.c 2009-10-27 21:37:03 UTC (rev 290001) +++ php/php-src/branches/PHP_5_2/ext/spl/spl_iterators.c 2009-10-27 21:57:26 UTC (rev 290002) @@ -1735,7 +1735,7 @@ return; } if (pos >= intern->u.limit.offset + intern->u.limit.count && intern->u.limit.count != -1) { - zend_throw_exception_ex(spl_ce_OutOfBoundsException, 0 TSRMLS_CC, "Cannot seek to %ld which is behind offest %ld plus count %ld", pos, intern->u.limit.offset, intern->u.limit.count); + zend_throw_exception_ex(spl_ce_OutOfBoundsException, 0 TSRMLS_CC, "Cannot seek to %ld which is behind offset %ld plus count %ld", pos, intern->u.limit.offset, intern->u.limit.count); return; } if (instanceof_function(intern->inner.ce, spl_ce_SeekableIterator TSRMLS_CC)) { Modified: php/php-src/branches/PHP_5_2/ext/spl/tests/iterator_032.phpt =================================================================== --- php/php-src/branches/PHP_5_2/ext/spl/tests/iterator_032.phpt 2009-10-27 21:37:03 UTC (rev 290001) +++ php/php-src/branches/PHP_5_2/ext/spl/tests/iterator_032.phpt 2009-10-27 21:57:26 UTC (rev 290002) @@ -47,6 +47,6 @@ int(2) Cannot seek to 0 which is below the offset 1 int(3) -Cannot seek to 3 which is behind offest 1 plus count 2 +Cannot seek to 3 which is behind offset 1 plus count 2 bool(false) ===DONE=== 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 2009-10-27 21:37:03 UTC (rev 290001) +++ php/php-src/branches/PHP_5_3/ext/spl/spl_iterators.c 2009-10-27 21:57:26 UTC (rev 290002) @@ -2077,7 +2077,7 @@ return; } if (pos >= intern->u.limit.offset + intern->u.limit.count && intern->u.limit.count != -1) { - zend_throw_exception_ex(spl_ce_OutOfBoundsException, 0 TSRMLS_CC, "Cannot seek to %ld which is behind offest %ld plus count %ld", pos, intern->u.limit.offset, intern->u.limit.count); + zend_throw_exception_ex(spl_ce_OutOfBoundsException, 0 TSRMLS_CC, "Cannot seek to %ld which is behind offset %ld plus count %ld", pos, intern->u.limit.offset, intern->u.limit.count); return; } if (instanceof_function(intern->inner.ce, spl_ce_SeekableIterator TSRMLS_CC)) { Modified: php/php-src/branches/PHP_5_3/ext/spl/tests/iterator_032.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/spl/tests/iterator_032.phpt 2009-10-27 21:37:03 UTC (rev 290001) +++ php/php-src/branches/PHP_5_3/ext/spl/tests/iterator_032.phpt 2009-10-27 21:57:26 UTC (rev 290002) @@ -45,6 +45,6 @@ int(2) Cannot seek to 0 which is below the offset 1 int(3) -Cannot seek to 3 which is behind offest 1 plus count 2 +Cannot seek to 3 which is behind offset 1 plus count 2 bool(false) ===DONE=== Modified: php/php-src/trunk/ext/spl/spl_iterators.c =================================================================== --- php/php-src/trunk/ext/spl/spl_iterators.c 2009-10-27 21:37:03 UTC (rev 290001) +++ php/php-src/trunk/ext/spl/spl_iterators.c 2009-10-27 21:57:26 UTC (rev 290002) @@ -2144,7 +2144,7 @@ return; } if (pos >= intern->u.limit.offset + intern->u.limit.count && intern->u.limit.count != -1) { - zend_throw_exception_ex(spl_ce_OutOfBoundsException, 0 TSRMLS_CC, "Cannot seek to %ld which is behind offest %ld plus count %ld", pos, intern->u.limit.offset, intern->u.limit.count); + zend_throw_exception_ex(spl_ce_OutOfBoundsException, 0 TSRMLS_CC, "Cannot seek to %ld which is behind offset %ld plus count %ld", pos, intern->u.limit.offset, intern->u.limit.count); return; } if (instanceof_function(intern->inner.ce, spl_ce_SeekableIterator TSRMLS_CC)) { Modified: php/php-src/trunk/ext/spl/tests/iterator_032.phpt =================================================================== --- php/php-src/trunk/ext/spl/tests/iterator_032.phpt 2009-10-27 21:37:03 UTC (rev 290001) +++ php/php-src/trunk/ext/spl/tests/iterator_032.phpt 2009-10-27 21:57:26 UTC (rev 290002) @@ -45,6 +45,6 @@ int(2) Cannot seek to 0 which is below the offset 1 int(3) -Cannot seek to 3 which is behind offest 1 plus count 2 +Cannot seek to 3 which is behind offset 1 plus count 2 bool(false) ===DONE===
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
