From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Tue, 26 Jan 2021 18:15:00 +0000 (+0100)
Subject: Merge branch 'PHP-7.4' into PHP-8.0
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=01a348617f1fc4f81b362c8a994aeb8cce844e23;p=php

Merge branch 'PHP-7.4' into PHP-8.0

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

01a348617f1fc4f81b362c8a994aeb8cce844e23
diff --cc NEWS
index c5691d40e3,6df4eecb57..111ebd52ce
--- a/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)