]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ee755fa a89c4a3)
Merge branch 'PHP-5.3' into PHP-5.4
authorStanislav Malyshev <stas@php.net>
Fri, 23 Mar 2012 05:30:51 +0000 (22:30 -0700)
committerStanislav Malyshev <stas@php.net>
Fri, 23 Mar 2012 05:30:51 +0000 (22:30 -0700)
* PHP-5.3:
  Revert "- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or" - causes bug #61482
  Add initialization tests for SQLT_INT binds
  Fix NEWS

1  2 
ext/spl/spl_directory.c patch | diff1 | diff2 | blob | history

diff --cc ext/spl/spl_directory.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.