Merge branch 'PHP-7.2' into PHP-7.3

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

Tue, 4 Jun 2019 14:14:14 +0000 (16:14 +0200)

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

Tue, 4 Jun 2019 14:14:14 +0000 (16:14 +0200)
author Nikita Popov <nikita.ppv@gmail.com>
Tue, 4 Jun 2019 14:14:14 +0000 (16:14 +0200)
committer Nikita Popov <nikita.ppv@gmail.com>
Tue, 4 Jun 2019 14:14:14 +0000 (16:14 +0200)
diff --cc TSRM/TSRM.h
Simple merge
diff --cc sapi/embed/php_embed.c
Simple merge
author	Nikita Popov <nikita.ppv@gmail.com>
	Tue, 4 Jun 2019 14:14:14 +0000 (16:14 +0200)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Tue, 4 Jun 2019 14:14:14 +0000 (16:14 +0200)
		1	2
TSRM/TSRM.h	patch \|	diff1 \|	diff2 \|	blob \| history
sapi/embed/php_embed.c	patch \|	diff1 \|	diff2 \|	blob \| history