Merge branch 'PHP-7.2' into PHP-7.3

author Stanislav Malyshev <stas@php.net>

Tue, 29 Sep 2020 04:39:34 +0000 (21:39 -0700)

committer Stanislav Malyshev <stas@php.net>

Tue, 29 Sep 2020 04:39:34 +0000 (21:39 -0700)
author Stanislav Malyshev <stas@php.net>
Tue, 29 Sep 2020 04:39:34 +0000 (21:39 -0700)
committer Stanislav Malyshev <stas@php.net>
Tue, 29 Sep 2020 04:39:34 +0000 (21:39 -0700)
diff --cc ext/openssl/openssl.c
Simple merge
diff --cc main/php_variables.c
Simple merge
author	Stanislav Malyshev <stas@php.net>
	Tue, 29 Sep 2020 04:39:34 +0000 (21:39 -0700)
committer	Stanislav Malyshev <stas@php.net>
	Tue, 29 Sep 2020 04:39:34 +0000 (21:39 -0700)
		1	2
ext/openssl/openssl.c	patch \|	diff1 \|	diff2 \|	blob \| history
main/php_variables.c	patch \|	diff1 \|	diff2 \|	blob \| history