From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Mon, 31 Dec 2018 19:49:35 +0000 (+0100)
Subject: Merge branch 'PHP-7.2' into PHP-7.3
X-Git-Tag: php-7.3.2RC1~69
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6f663c3a2e920a321367ce0bd0446615a708c3cd;p=php

Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #77391: 1bpp BMPs may fail to be loaded
---

6f663c3a2e920a321367ce0bd0446615a708c3cd
diff --cc NEWS
index e4ce2b4471,552c94d136..1567213e1e
--- a/NEWS
+++ b/NEWS
@@@ -1,19 -1,10 +1,22 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2019, PHP 7.2.15
 +?? ??? ????, PHP 7.3.2
 +
 +- Core:
 +  . Fixed bug #77339 (__callStatic may get incorrect arguments). (Dmitry)
 +  . Fixed bug #77317 (__DIR__, __FILE__, realpath() reveal physical path for
 +    subst virtual drive). (Anatol)
 +
 +- Fileinfo:
 +  . Fixed bug #77346 (webm files incorrectly detected as
 +    application/octet-stream). (Anatol)
  
+ - GD:
+   . Fixed bug #77391 (1bpp BMPs may fail to be loaded). (Romain Déoux, cmb)
+ 
 +- PCRE:
 +  . Fixed bug #77338 (get_browser with empty string). (Nikita)
 +
  - Sockets:
    . Fixed bug #76839 (socket_recvfrom may return an invalid 'from' address
      on MacOS). (Michael Meyer)