From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 23 May 2019 09:12:34 +0000 (+0200)
Subject: Merge branch 'PHP-7.2' into PHP-7.3
X-Git-Tag: php-7.3.7RC1~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b394654c1eb35f99aa356dacd73e2249be4278cc;p=php

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

b394654c1eb35f99aa356dacd73e2249be4278cc
diff --cc NEWS
index 05806e23e3,1277de38a9..a62c9dd881
--- a/NEWS
+++ b/NEWS
@@@ -14,15 -14,11 +14,19 @@@ PH
    . Fixed bug #77956 (When mysqli.allow_local_infile = Off, use a meaningful
      error message). (Sjon Hortensius)
  
 +- Opcache:
 +  . Fixed bug #78015 (Incorrect evaluation of expressions involving partials
 +    arrays in SCCP). (Nikita)
 +
+ - Sockets:
+   . Fixed bug #78038 (Socket_select fails when resource array contains
+     references). (Nikita)
+ 
 -30 May 2019, PHP 7.2.19
 +16 May 2019, PHP 7.3.6RC1
 +
 +- cURL:
 +  . Implemented FR #72189 (Add missing CURL_VERSION_* constants). (Javier
 +    Spagnoletti)
  
  - FPM:
    . Fixed bug #77934 (php-fpm kill -USR2 not working). (Jakub Zelenka)