Merge branch 'PHP-7.0' into PHP-7.1

author Nikita Popov <nikic@php.net>

Sat, 7 Jan 2017 21:54:16 +0000 (22:54 +0100)

committer Nikita Popov <nikic@php.net>

Sat, 7 Jan 2017 21:54:16 +0000 (22:54 +0100)
author Nikita Popov <nikic@php.net>
Sat, 7 Jan 2017 21:54:16 +0000 (22:54 +0100)
committer Nikita Popov <nikic@php.net>
Sat, 7 Jan 2017 21:54:16 +0000 (22:54 +0100)
diff --cc main/fastcgi.c
Simple merge
diff --cc main/fastcgi.h
Simple merge
diff --cc sapi/fpm/fpm/fpm_main.c
Simple merge
author	Nikita Popov <nikic@php.net>
	Sat, 7 Jan 2017 21:54:16 +0000 (22:54 +0100)
committer	Nikita Popov <nikic@php.net>
	Sat, 7 Jan 2017 21:54:16 +0000 (22:54 +0100)
		1	2
main/fastcgi.c	patch \|	diff1 \|	diff2 \|	blob \| history
main/fastcgi.h	patch \|	diff1 \|	diff2 \|	blob \| history
sapi/fpm/fpm/fpm_main.c	patch \|	diff1 \|	diff2 \|	blob \| history