Merge branch 'PHP-7.4' into PHP-8.0

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

Fri, 4 Dec 2020 12:04:16 +0000 (13:04 +0100)

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

Fri, 4 Dec 2020 12:04:33 +0000 (13:04 +0100)
author Christoph M. Becker <cmbecker69@gmx.de>
Fri, 4 Dec 2020 12:04:16 +0000 (13:04 +0100)
committer Christoph M. Becker <cmbecker69@gmx.de>
Fri, 4 Dec 2020 12:04:33 +0000 (13:04 +0100)
diff --cc NEWS
Simple merge
diff --cc ext/phar/tar.c
Simple merge
author	Christoph M. Becker <cmbecker69@gmx.de>
	Fri, 4 Dec 2020 12:04:16 +0000 (13:04 +0100)
committer	Christoph M. Becker <cmbecker69@gmx.de>
	Fri, 4 Dec 2020 12:04:33 +0000 (13:04 +0100)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
ext/phar/tar.c	patch \|	diff1 \|	diff2 \|	blob \| history