Merge branch 'PHP-7.0' into PHP-7.1

author Nikita Popov <nikita.ppv@gmail.com>

Tue, 5 Sep 2017 14:24:11 +0000 (16:24 +0200)

committer Nikita Popov <nikita.ppv@gmail.com>

Tue, 5 Sep 2017 14:24:21 +0000 (16:24 +0200)
author Nikita Popov <nikita.ppv@gmail.com>
Tue, 5 Sep 2017 14:24:11 +0000 (16:24 +0200)
committer Nikita Popov <nikita.ppv@gmail.com>
Tue, 5 Sep 2017 14:24:21 +0000 (16:24 +0200)
diff --cc NEWS
Simple merge
diff --cc sapi/cli/php_cli_server.c
Simple merge
author	Nikita Popov <nikita.ppv@gmail.com>
	Tue, 5 Sep 2017 14:24:11 +0000 (16:24 +0200)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Tue, 5 Sep 2017 14:24:21 +0000 (16:24 +0200)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
sapi/cli/php_cli_server.c	patch \|	diff1 \|	diff2 \|	blob \| history