Merge branch 'PHP-7.1'

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

Sat, 1 Apr 2017 23:08:42 +0000 (01:08 +0200)

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

Sat, 1 Apr 2017 23:08:42 +0000 (01:08 +0200)
author Nikita Popov <nikita.ppv@gmail.com>
Sat, 1 Apr 2017 23:08:42 +0000 (01:08 +0200)
committer Nikita Popov <nikita.ppv@gmail.com>
Sat, 1 Apr 2017 23:08:42 +0000 (01:08 +0200)
diff --cc ext/openssl/openssl.c
Simple merge
diff --cc php.ini-development
Simple merge
diff --cc php.ini-production
Simple merge
author	Nikita Popov <nikita.ppv@gmail.com>
	Sat, 1 Apr 2017 23:08:42 +0000 (01:08 +0200)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Sat, 1 Apr 2017 23:08:42 +0000 (01:08 +0200)
		1	2
ext/openssl/openssl.c	patch \|	diff1 \|	diff2 \|	blob \| history
php.ini-development	patch \|	diff1 \|	diff2 \|	blob \| history
php.ini-production	patch \|	diff1 \|	diff2 \|	blob \| history