granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c4a3f67 9eb0c63)

author	Michael Wallner <mike@php.net>
	Wed, 2 Apr 2014 13:38:35 +0000 (15:38 +0200)
committer	Michael Wallner <mike@php.net>
	Wed, 2 Apr 2014 13:38:35 +0000 (15:38 +0200)
commit	68c57f8149b0493fa54533e600fd9c91cf596e1a
tree	efa4aeef1dd481819d867c12a48745dca84b3505	tree \| snapshot
parent	c4a3f67708a5f7b47b1c69f5027d997adb6f2fc1	commit \| diff
parent	9eb0c634d457245ac99bacf20fc69d0e17cf094a	commit \| diff

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
NEWS
Fixed bug #61019 (Out of memory on command stream_get_contents)

main/streams/streams.c

Unnamed repository; edit this file 'description' to name the repository.