Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix #69279: Compressed ZIP Phar extractTo() creates garbage files

diff --cc NEWS
index 50ed9a6c14ee62479eb86f47d8871a42b93cd24d,c74a329030c53fc5a6cac4412c00fd7a7d3fad47..aea46517a1985b3991778c1a3929f15c94b81b1d
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -43,29 -23,16 +43,31 @@@ PH
    . Fixed bug #77935 (Crash in mysqlnd_fetch_stmt_row_cursor when calling an SP
      with a cursor). (Nikita)
  
 +- ODBC:
 +  . Fixed bug #80592 (all floats are the same in ODBC parameters). (cmb)
 +
 +- Opcache:
 +  . Fixed bug #80422 (php_opcache.dll crashes when using Apache 2.4 with JIT).
 +    (Dmitry)
 +
 +- PDO_Firebird:
 +  . Fixed bug #80521 (Parameters with underscores no longer recognized). (cmb,
 +    Simonov Denis)
 +
  - Phar:
 +  . Fixed bug #76929 (zip-based phar does not respect phar.require_hash).
 +    (david at bamsoftware, cmb)
    . Fixed bug #77565 (Incorrect locator detection in ZIP-based phars). (cmb)
+   . Fixed bug #69279 (Compressed ZIP Phar extractTo() creates garbage files).
+     (cmb)
  
 -07 Jan 2021, PHP 7.4.14
 +- Phpdbg:
 +  . Reverted fix for bug #76813 (Access violation near NULL on source operand).
 +    (cmb)
 +
 +07 Jan 2021, PHP 8.0.1
  
  - Core:
 -  . Fixed bug #74558 (Can't rebind closure returned by Closure::fromCallable()).
 -    (cmb)
    . Fixed bug #80345 (PHPIZE configuration has outdated PHP_RELEASE_VERSION).
      (cmb)
    . Fixed bug #72964 (White space not unfolded for CC/Bcc headers). (cmb)

diff --cc ext/phar/phar_object.c
Simple merge