From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Mon, 29 Jun 2020 15:46:31 +0000 (+0200)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dfac28f8d87c14e2f9fd3427a7c87be1239f6e6a;p=php

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #79756: finfo_file crash (FILEINFO_MIME)
---

dfac28f8d87c14e2f9fd3427a7c87be1239f6e6a
diff --cc NEWS
index a76a208b0c,5ba6019106..9cd92b316a
--- a/NEWS
+++ b/NEWS
@@@ -6,10 -6,13 +6,13 @@@ PH
    . Fixed bug #79030 (Upgrade apache2handler's php_apache_sapi_get_request_time
      to return usec). (Herbert256)
  
 -- Curl:
 -  . Fixed bug #79741 (curl_setopt CURLOPT_POSTFIELDS asserts on object with
 -    declared properties). (Nikita)
 +- Core:
 +  . Fixed bug #79740 (serialize() and unserialize() methods can not be called
 +    statically). (Nikita)
  
+ - Fileinfo:
+   . Fixed bug #79756 (finfo_file crash (FILEINFO_MIME)). (cmb)
+ 
  - FTP:
    . Fixed bug #55857 (ftp_size on large files). (cmb)