Merge branch 'pull-request/2152' into PHP-7.1

author Joe Watkins <krakjoe@php.net>

Thu, 20 Oct 2016 04:23:21 +0000 (05:23 +0100)

committer Joe Watkins <krakjoe@php.net>

Thu, 20 Oct 2016 04:23:21 +0000 (05:23 +0100)
author Joe Watkins <krakjoe@php.net>
Thu, 20 Oct 2016 04:23:21 +0000 (05:23 +0100)
committer Joe Watkins <krakjoe@php.net>
Thu, 20 Oct 2016 04:23:21 +0000 (05:23 +0100)
diff --cc ext/soap/php_http.c
Simple merge
diff --cc ext/soap/soap.c
Simple merge
author	Joe Watkins <krakjoe@php.net>
	Thu, 20 Oct 2016 04:23:21 +0000 (05:23 +0100)
committer	Joe Watkins <krakjoe@php.net>
	Thu, 20 Oct 2016 04:23:21 +0000 (05:23 +0100)
		1	2
ext/soap/php_http.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/soap/soap.c	patch \|	diff1 \|	diff2 \|	blob \| history