Merge branch 'PHP-7.0' into PHP-7.1

author Anatol Belski <ab@php.net>

Fri, 23 Sep 2016 14:07:12 +0000 (16:07 +0200)

committer Anatol Belski <ab@php.net>

Fri, 23 Sep 2016 14:07:12 +0000 (16:07 +0200)
author Anatol Belski <ab@php.net>
Fri, 23 Sep 2016 14:07:12 +0000 (16:07 +0200)
committer Anatol Belski <ab@php.net>
Fri, 23 Sep 2016 14:07:12 +0000 (16:07 +0200)
diff --cc ext/soap/soap.c
Simple merge
diff --cc main/streams/streams.c
Simple merge
author	Anatol Belski <ab@php.net>
	Fri, 23 Sep 2016 14:07:12 +0000 (16:07 +0200)
committer	Anatol Belski <ab@php.net>
	Fri, 23 Sep 2016 14:07:12 +0000 (16:07 +0200)
		1	2
ext/soap/soap.c	patch \|	diff1 \|	diff2 \|	blob \| history
main/streams/streams.c	patch \|	diff1 \|	diff2 \|	blob \| history