Merge branch 'PHP-7.3' into PHP-7.4

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

Mon, 5 Oct 2020 15:47:21 +0000 (17:47 +0200)

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

Mon, 5 Oct 2020 15:47:35 +0000 (17:47 +0200)
author Christoph M. Becker <cmbecker69@gmx.de>
Mon, 5 Oct 2020 15:47:21 +0000 (17:47 +0200)
committer Christoph M. Becker <cmbecker69@gmx.de>
Mon, 5 Oct 2020 15:47:35 +0000 (17:47 +0200)
diff --cc NEWS
Simple merge
diff --cc ext/odbc/php_odbc.c
Simple merge
author	Christoph M. Becker <cmbecker69@gmx.de>
	Mon, 5 Oct 2020 15:47:21 +0000 (17:47 +0200)
committer	Christoph M. Becker <cmbecker69@gmx.de>
	Mon, 5 Oct 2020 15:47:35 +0000 (17:47 +0200)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
ext/odbc/php_odbc.c	patch \|	diff1 \|	diff2 \|	blob \| history