Merge branch 'PHP-7.3' into PHP-7.4

author Christoph M. Becker <cmbecker69@gmx.de>

Mon, 12 Oct 2020 11:32:28 +0000 (13:32 +0200)

committer Christoph M. Becker <cmbecker69@gmx.de>

Mon, 12 Oct 2020 11:32:40 +0000 (13:32 +0200)
author Christoph M. Becker <cmbecker69@gmx.de>
Mon, 12 Oct 2020 11:32:28 +0000 (13:32 +0200)
committer Christoph M. Becker <cmbecker69@gmx.de>
Mon, 12 Oct 2020 11:32:40 +0000 (13:32 +0200)
diff --cc NEWS
Simple merge
diff --cc ext/imap/php_imap.c
Simple merge
author	Christoph M. Becker <cmbecker69@gmx.de>
	Mon, 12 Oct 2020 11:32:28 +0000 (13:32 +0200)
committer	Christoph M. Becker <cmbecker69@gmx.de>
	Mon, 12 Oct 2020 11:32:40 +0000 (13:32 +0200)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
ext/imap/php_imap.c	patch \|	diff1 \|	diff2 \|	blob \| history