]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Sun, 20 Apr 2014 22:26:51 +0000 (15:26 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 20 Apr 2014 22:27:39 +0000 (15:27 -0700)
commit774f16318b3739e751d5a041f3601a3cf3000614
treeffdd73973aa30c738e55fe9f5ce1c26636b2631c
parent1bca3ecacc19686d949f55cec410beea40491685
parent5addf223d597c56638a34f9ef0061d454e748abe
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #65701: Do not use cache for file file copy
NEWS
ext/standard/file.c
main/php_streams.h
main/streams/streams.c