Merge branch 'PHP-7.0' into PHP-7.1

author Anatol Belski <ab@php.net>

Tue, 28 Mar 2017 11:13:24 +0000 (13:13 +0200)

committer Anatol Belski <ab@php.net>

Tue, 28 Mar 2017 11:13:24 +0000 (13:13 +0200)
author Anatol Belski <ab@php.net>
Tue, 28 Mar 2017 11:13:24 +0000 (13:13 +0200)
committer Anatol Belski <ab@php.net>
Tue, 28 Mar 2017 11:13:24 +0000 (13:13 +0200)
diff --cc sapi/apache2handler/php_apache.h
Simple merge
diff --cc sapi/apache2handler/sapi_apache2.c
Simple merge
author	Anatol Belski <ab@php.net>
	Tue, 28 Mar 2017 11:13:24 +0000 (13:13 +0200)
committer	Anatol Belski <ab@php.net>
	Tue, 28 Mar 2017 11:13:24 +0000 (13:13 +0200)
		1	2
sapi/apache2handler/php_apache.h	patch \|	diff1 \|	diff2 \|	blob \| history
sapi/apache2handler/sapi_apache2.c	patch \|	diff1 \|	diff2 \|	blob \| history