From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 5 Oct 2018 16:41:42 +0000 (+0200)
Subject: Merge branch 'PHP-7.2' into PHP-7.3
X-Git-Tag: php-7.3.0RC3~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aa376cc1d5cc7667d410ac49892765497040334f;p=php

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

aa376cc1d5cc7667d410ac49892765497040334f
diff --cc NEWS
index dccd2f2c41,ee75ecd908..2c67c14244
--- a/NEWS
+++ b/NEWS
@@@ -17,9 -10,10 +17,13 @@@ PH
  - FCGI:
    . Fixed #76948 (Failed shutdown/reboot or end session in Windows). (Anatol)
  
+ - FTP:
+   . Fixed bug #76972 (Data truncation due to forceful ssl socket shutdown).
+     (Manuel Mausz)
+ 
 +- Mbstring:
 +  . Fixed bug #76958 (Broken UTF7-IMAP conversion). (Nikita)
 +
  - Reflection:
    . Fixed bug #76936 (Objects cannot access their private attributes while
      handling reflection errors). (Nikita)