From: Nikita Popov <nikita.ppv@gmail.com>
Date: Mon, 29 Jul 2019 15:34:08 +0000 (+0200)
Subject: Merge branch 'PHP-7.2' into PHP-7.3
X-Git-Tag: php-7.4.0beta2~25^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=44fe025c2839b9da51c3b0a0ea90382ac9c14fd4;p=php

Merge branch 'PHP-7.2' into PHP-7.3
---

44fe025c2839b9da51c3b0a0ea90382ac9c14fd4
diff --cc NEWS
index dd4cdbc6f0,d8181a7028..76ea3d16bf
--- a/NEWS
+++ b/NEWS
@@@ -24,12 -20,28 +24,14 @@@ PH
  - Standard:
    . Fixed bug #69100 (Bus error from stream_copy_to_stream (file -> SSL stream)
      with invalid length). (Nikita)
+   . Fixed bug #78326 (improper memory deallocation on stream_get_contents()
+     with fixed length buffer). (Albert Casademont)
  
 -01 Aug 2019, PHP 7.2.21
 -
 -- Fileinfo:
 -  . Fixed bug #78183 (finfo_file shows wrong mime-type for .tga file).
 -    (Joshua Westerheide)
 -
 -- FTP:
 -  . Fixed bug #77124 (FTP with SSL memory leak). (Nikita)
 -
 -- PDO_Sqlite:
 -  . Fixed bug #78192 (SegFault when reuse statement after schema has changed).
 -    (Vincent Quatrevieux)
 -
 -- SQLite:
 -  . Upgraded to SQLite 3.28.0. (cmb)
 +01 Aug 2019, PHP 7.3.8
  
 -- XMLRPC:
 -  . Fixed bug #78173 (XML-RPC mutates immutable objects during encoding).
 -    (Asher Baker)
 +- Core:
 +  . Added syslog.filter=raw option. (Erik Lundin)
 +  . Fixed bug #78212 (Segfault in built-in webserver). (cmb)
  
  - Date:
    . Fixed bug #69044 (discrepency between time and microtime). (krakjoe)