[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/spl/spl_iterators.c

2013-09-18 Thread David Soria Parra 
Commit:94e4c4df86719dbdf265b9d7ccfd1db8cfd32fdf
Author:David Soria Parra d...@php.net Wed, 18 Sep 2013 15:06:51 
+0200
Parents:   2eb566188625162644a186bcb6757f22978c54f9 
7a24ee13ec74bf3e85970e59dd69db8034ff434c
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=94e4c4df86719dbdf265b9d7ccfd1db8cfd32fdf

Log:
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Revert EmptyIterator now implements Countable; fixes bug 60577

Bugs:
https://bugs.php.net/60577

Changed paths:
  MM  ext/spl/spl_iterators.c


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/spl/spl_iterators.c

2013-06-09 Thread Xinchen Hui 
Commit:3f229f43644bcf450c43103364cc8a800961c45e
Author:Xinchen Hui larue...@php.net Sun, 9 Jun 2013 22:25:49 +0800
Parents:   b839e6921da08adf1d8413cea5c2a21da069e23e 
fdd73796866cd95ffc3af1864509c2af8d983949
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=3f229f43644bcf450c43103364cc8a800961c45e

Log:
Merge branch 'PHP-5.4' into PHP-5.5

Changed paths:
  MM  ext/spl/spl_iterators.c


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php