Merge branch 'PHP-7.1'

author Jakub Zelenka <bukka@php.net>

Sun, 30 Apr 2017 19:28:38 +0000 (20:28 +0100)

committer Jakub Zelenka <bukka@php.net>

Sun, 30 Apr 2017 19:28:38 +0000 (20:28 +0100)
author Jakub Zelenka <bukka@php.net>
Sun, 30 Apr 2017 19:28:38 +0000 (20:28 +0100)
committer Jakub Zelenka <bukka@php.net>
Sun, 30 Apr 2017 19:28:38 +0000 (20:28 +0100)
diff --cc configure.ac
Simple merge
diff --cc main/network.c
Simple merge
author	Jakub Zelenka <bukka@php.net>
	Sun, 30 Apr 2017 19:28:38 +0000 (20:28 +0100)
committer	Jakub Zelenka <bukka@php.net>
	Sun, 30 Apr 2017 19:28:38 +0000 (20:28 +0100)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
main/network.c	patch \|	diff1 \|	diff2 \|	blob \| history