granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f53ea4c 89a5bd6)

author	Anatol Belski <ab@php.net>
	Wed, 15 Feb 2017 13:49:58 +0000 (14:49 +0100)
committer	Anatol Belski <ab@php.net>
	Wed, 15 Feb 2017 13:49:58 +0000 (14:49 +0100)
commit	2a61e5495affef963f04a3322412c1d316d83ab5
tree	f281200c8b17ce7c7f6ec87d56c1d86526e4edf1	tree \| snapshot
parent	f53ea4cd6066784416ce99ef582c564367bbded1	commit \| diff
parent	89a5bd67500510f30a729ff97048fa230c9f9bd3	commit \| diff

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fixed bug #74090 stream_get_contents maxlength>-1 returns empty string

main/streams/xp_socket.c

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