Merge branch 'PHP-7.1' into PHP-7.2

author Anatol Belski <ab@php.net>

Tue, 28 Nov 2017 19:34:44 +0000 (20:34 +0100)

committer Anatol Belski <ab@php.net>

Tue, 28 Nov 2017 19:34:44 +0000 (20:34 +0100)
author Anatol Belski <ab@php.net>
Tue, 28 Nov 2017 19:34:44 +0000 (20:34 +0100)
committer Anatol Belski <ab@php.net>
Tue, 28 Nov 2017 19:34:44 +0000 (20:34 +0100)
diff --cc main/SAPI.c
Simple merge
diff --cc sapi/cgi/cgi_main.c
Simple merge
author	Anatol Belski <ab@php.net>
	Tue, 28 Nov 2017 19:34:44 +0000 (20:34 +0100)
committer	Anatol Belski <ab@php.net>
	Tue, 28 Nov 2017 19:34:44 +0000 (20:34 +0100)
		1	2
main/SAPI.c	patch \|	diff1 \|	diff2 \|	blob \| history
sapi/cgi/cgi_main.c	patch \|	diff1 \|	diff2 \|	blob \| history