Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix #70091: Phar does not mark UTF-8 filenames in ZIP archives

diff --cc NEWS
index c5691d40e3dc5a7868091789ab5df1d895c5f848,6df4eecb5716150acd045cf41f89c7b9eca737df..111ebd52ce6dca242f95fa39f3245f3c199c5919
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -13,8 -5,13 +13,9 @@@ PH
  - Phar:
    . Fixed bug #75850 (Unclear error message wrt. __halt_compiler() w/o
      semicolon) (cmb)
+   . Fixed bug #70091 (Phar does not mark UTF-8 filenames in ZIP archives). (cmb)
  
 -- Zip:
 -  . Fixed bug #80648 (Fix for bug 79296 should be based on runtime version).
 -    (cmb, Remi)
 -
 -21 Jan 2021, PHP 7.4.15
 +21 Jan 2021, PHP 8.0.2
  
  - Core:
    . Fixed bug #80523 (bogus parse error on >4GB source code). (Nikita)

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