]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f17fe2c d08b4db)
Merge branch 'PHP-5.4' into PHP-5.5
authorMichael Wallner <mike@php.net>
Thu, 3 Apr 2014 08:40:20 +0000 (10:40 +0200)
committerMichael Wallner <mike@php.net>
Thu, 3 Apr 2014 08:40:20 +0000 (10:40 +0200)
* PHP-5.4:
  Fix Bug #66736  fpassthru broken

1  2 
main/output.c patch | diff1 | diff2 | blob | history
main/streams/streams.c patch | diff1 | diff2 | blob | history

diff --cc main/output.c
Simple merge
diff --cc main/streams/streams.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.