]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 68556f3 1ec83d4)
Merge branch 'PHP-5.4' into PHP-5.5
authorMichael Wallner <mike@php.net>
Wed, 2 Apr 2014 13:37:50 +0000 (15:37 +0200)
committerMichael Wallner <mike@php.net>
Wed, 2 Apr 2014 13:37:50 +0000 (15:37 +0200)
* PHP-5.4:
  Fixed bug #61019 (Out of memory on command stream_get_contents)

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

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