Merge branch 'PHP-7.3' into PHP-7.4

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

Mon, 10 Aug 2020 18:43:04 +0000 (20:43 +0200)

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

Mon, 10 Aug 2020 18:43:13 +0000 (20:43 +0200)
author Nikita Popov <nikita.ppv@gmail.com>
Mon, 10 Aug 2020 18:43:04 +0000 (20:43 +0200)
committer Nikita Popov <nikita.ppv@gmail.com>
Mon, 10 Aug 2020 18:43:13 +0000 (20:43 +0200)
diff --cc NEWS
Simple merge
diff --cc ext/standard/dns.c
Simple merge
author	Nikita Popov <nikita.ppv@gmail.com>
	Mon, 10 Aug 2020 18:43:04 +0000 (20:43 +0200)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Mon, 10 Aug 2020 18:43:13 +0000 (20:43 +0200)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
ext/standard/dns.c	patch \|	diff1 \|	diff2 \|	blob \| history