Merge branch 'PHP-7.1' into PHP-7.2

author Jakub Zelenka <bukka@php.net>

Fri, 30 Mar 2018 16:58:29 +0000 (17:58 +0100)

committer Jakub Zelenka <bukka@php.net>

Fri, 30 Mar 2018 16:58:29 +0000 (17:58 +0100)
author Jakub Zelenka <bukka@php.net>
Fri, 30 Mar 2018 16:58:29 +0000 (17:58 +0100)
committer Jakub Zelenka <bukka@php.net>
Fri, 30 Mar 2018 16:58:29 +0000 (17:58 +0100)
diff --cc NEWS
Simple merge
diff --cc sapi/fpm/fpm/fpm_sockets.c
Simple merge
author	Jakub Zelenka <bukka@php.net>
	Fri, 30 Mar 2018 16:58:29 +0000 (17:58 +0100)
committer	Jakub Zelenka <bukka@php.net>
	Fri, 30 Mar 2018 16:58:29 +0000 (17:58 +0100)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
sapi/fpm/fpm/fpm_sockets.c	patch \|	diff1 \|	diff2 \|	blob \| history