Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Properly fix #80220

diff --cc NEWS
index 2165f0c9209b3a6fcd57d206d8069011e57a6126,05d3b73b86945c8aa76df29a8f2760985b52dfd2..c7e2e12a25539d05b5c06badbb492cadcde905db
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -5,24 -5,13 +5,25 @@@ PH
  - 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)
  
 -29 Oct 2020, PHP 7.3.24
 +- 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)
 +
 +29 Oct 2020, PHP 7.4.12
  
  - 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)
  
  - Calendar:
    . Fixed bug #80185 (jdtounix() fails after 2037). (cmb)

diff --cc ext/imap/php_imap.c
Simple merge