From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 20 Nov 2018 20:16:19 +0000 (+0100)
Subject: Merge branch 'PHP-7.2' into PHP-7.3
X-Git-Tag: php-7.3.1RC1~67
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a0d3406f69cbca40d97a37755282dc463605110;p=php

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

7a0d3406f69cbca40d97a37755282dc463605110
diff --cc NEWS
index b97fe025ea,ecb3391d8c..e5975014dd
--- a/NEWS
+++ b/NEWS
@@@ -1,8 -1,15 +1,12 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2018, PHP 7.2.14
 +?? ??? ????, PHP 7.3.0
  
+ - Sockets:
+   . Fixed bug #77136 (Unsupported IPV6_RECVPKTINFO constants on macOS).
+     (Mizunashi Mana)
+ 
 -06 Dec 2018, PHP 7.2.13
 -
 -- ftp:
 -  . Fixed bug #77151 (ftp_close(): SSL_read on shutdown). (Remi)
 +22 Nov 2018, PHP 7.3.0RC6
  
  - CLI:
    . Fixed bug #77111 (php-win.exe corrupts unicode symbols from cli