From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 20 Nov 2018 20:30:27 +0000 (+0100)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.14RC1~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bbbaf1ca8559fc45d581de7b22e94d163cd28fc7;p=php

Merge branch 'PHP-7.1' into PHP-7.2
---

bbbaf1ca8559fc45d581de7b22e94d163cd28fc7
diff --cc NEWS
index ecb3391d8c,11e27b84d3..d02ae5c15b
--- a/NEWS
+++ b/NEWS
@@@ -1,13 -1,11 +1,17 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2018, PHP 7.1.25
 +?? ??? 2018, PHP 7.2.14
  
+ - Core:
+   . Fixed bug #71041 (zend_signal_startup() needs ZEND_API).
+     (Valentin V. Bartenev)
+ 
 +- 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)