]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Tue, 2 Apr 2013 14:24:14 +0000 (16:24 +0200)
committerRemi Collet <remi@php.net>
Tue, 2 Apr 2013 14:24:14 +0000 (16:24 +0200)
* PHP-5.4:
  fix comment
  Fixed Bug #64565 copy doesn't report failure on partial copy

1  2 
main/streams/streams.c

Simple merge