From: Pierrick Charron <pierrick@php.net>
Date: Tue, 18 Sep 2018 00:31:07 +0000 (-0400)
Subject: Merge branch 'PHP-7.2' into PHP-7.3
X-Git-Tag: php-7.3.0RC2~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aec2d63124151be4eed360c01a289bf3ab577fc2;p=php

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

aec2d63124151be4eed360c01a289bf3ab577fc2
diff --cc NEWS
index ea57810331,166745444a..8c77f2f414
--- a/NEWS
+++ b/NEWS
@@@ -1,9 -1,8 +1,14 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2018, PHP 7.2.11
 +?? ??? ????, PHP 7.3.0RC2
++
++- CURL:
++  . Fixed bug #76480 (Use curl_multi_wait() so that timeouts are respected).
++    (Pierrick)
+ 
  - Core:
 +  . Fixed bug #76869 (Incorrect bypassing protected method accessibilty check).
 +    (Dmitry)
    . Fixed bug #76800 (foreach inconsistent if array modified during loop).
      (Dmitry)