From: Nikita Popov <nikita.ppv@gmail.com>
Date: Mon, 15 Jul 2019 13:19:43 +0000 (+0200)
Subject: Merge branch 'PHP-7.2' into PHP-7.3
X-Git-Tag: php-7.3.8RC1~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2d737a1e4be482680f976f594c8b9aca374d6183;p=php

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

2d737a1e4be482680f976f594c8b9aca374d6183
diff --cc NEWS
index 3fcacbb17c,d04dc6b79b..b894cc5b62
--- a/NEWS
+++ b/NEWS
@@@ -8,8 -22,7 +8,11 @@@ PH
  
  - Date:
    . Fixed bug #69044 (discrepency between time and microtime). (krakjoe)
 +  . Updated timelib to 2018.02. (Derick)
 +
++- FTP:
++  . Fixed bug #78039 (FTP with SSL memory leak). (Nikita)
+ 
  - Libxml:
    . Fixed bug #78279 (libxml_disable_entity_loader settings is shared between
      requests (cgi-fcgi)). (Nikita)