Merge branch 'PHP-7.4' into PHP-8.0

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

Tue, 19 Jan 2021 10:44:22 +0000 (11:44 +0100)

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

Tue, 19 Jan 2021 10:44:22 +0000 (11:44 +0100)
author Nikita Popov <nikita.ppv@gmail.com>
Tue, 19 Jan 2021 10:44:22 +0000 (11:44 +0100)
committer Nikita Popov <nikita.ppv@gmail.com>
Tue, 19 Jan 2021 10:44:22 +0000 (11:44 +0100)
diff --cc ext/standard/file.c
Simple merge
diff --cc main/php_open_temporary_file.c
Simple merge
diff --cc main/php_open_temporary_file.h
Simple merge
diff --cc main/rfc1867.c
Simple merge
author	Nikita Popov <nikita.ppv@gmail.com>
	Tue, 19 Jan 2021 10:44:22 +0000 (11:44 +0100)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Tue, 19 Jan 2021 10:44:22 +0000 (11:44 +0100)
		1	2
ext/standard/file.c	patch \|	diff1 \|	diff2 \|	blob \| history
main/php_open_temporary_file.c	patch \|	diff1 \|	diff2 \|	blob \| history
main/php_open_temporary_file.h	patch \|	diff1 \|	diff2 \|	blob \| history
main/rfc1867.c	patch \|	diff1 \|	diff2 \|	blob \| history