From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Tue, 20 Oct 2020 11:36:17 +0000 (+0200)
Subject: Merge branch 'PHP-7.4' into PHP-8.0
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=486c49dee80440e3aeafc90733c3afe6a19abaed;p=php

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Properly fix #80220
---

486c49dee80440e3aeafc90733c3afe6a19abaed
diff --cc NEWS
index 54948f1134,c7e2e12a25..3977dcdd55
--- a/NEWS
+++ b/NEWS
@@@ -1,25 -1,32 +1,26 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2020, PHP 7.4.13
 +?? ??? ????, PHP 8.0.0RC3
 +
 +- Core:
 +  . Fixed bug #8055 (Abstract trait methods returning "self" cannot be
 +    fulfilled by traits). (Nikita)
  
  - IMAP:
 -  . Fixed bug #64076 (imap_sort() does not return FALSE on failure). (cmb)
    . Fixed bug #80239 (imap_rfc822_write_address() leaks memory). (cmb)
+   . Fixed minor regression caused by fixing bug #80220. (cmb)
  
  - Opcache:
 -  . Fixed bug #79643 (PHP with Opcache crashes when a file with specific name
 -    is included). (twosee)
 -
 -- OpenSSL:
 -  . Fixed bug #79983 (openssl_encrypt / openssl_decrypt fail with OCB mode).
 -    (Nikita)
 +  . Fixed bug #80255 (Opcache bug (bad condition result) in 8.0.0rc1). (Nikita)
  
 -29 Oct 2020, PHP 7.4.12
 +15 Oct 2020, PHP 8.0.0RC2
  
  - Core:
 -  . Fixed bug #80061 (Copying large files may have suboptimal performance).
 -    (cmb)
 -  . Fixed bug #79423 (copy command is limited to size of file it can copy).
 -    (cmb)
 -  . Fixed bug #80126 (Covariant return types failing compilation). (Nikita)
 -  . Fixed bug #80186 (Segfault when iterating over FFI object). (Nikita)
 +  . Fixed bug #80225 (broken namespace usage in eval code). (Nikita)
  
 -- Calendar:
 -  . Fixed bug #80185 (jdtounix() fails after 2037). (cmb)
 +- Curl:
 +  . Fixed bug #80121 (Null pointer deref if CurlHandle directly instantiated).
 +    (Nikita)
  
  - IMAP:
    . Fixed bug #80213 (imap_mail_compose() segfaults on certain $bodies). (cmb)