From: Joe Watkins <krakjoe@php.net>
Date: Tue, 25 Jul 2017 05:58:47 +0000 (+0100)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.0beta2~42
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4ddb0630c216481dbc25605421551ad676c8c4f0;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed finding CURL on systems with multiarch support
---

4ddb0630c216481dbc25605421551ad676c8c4f0
diff --cc NEWS
index ed0a13b1ee,3e32ae06e1..d47196a333
--- a/NEWS
+++ b/NEWS
@@@ -6,12 -6,11 +6,16 @@@ PH
    . Fixed bug #74947 (Segfault in scanner on INF number). (Laruence)
    . Fixed bug #74954 (null deref and segfault in zend_generator_resume()). (Bob)
  
 +- CLI:
 +  . Fixed bug #74979 (Interactive shell opening instead of script execution
 +    with -f flag). (Anatol)
 +
+ - cURL:
+   . Fixed bug #74125 (Fixed finding CURL on systems with multiarch support).
+     (cebe)
+ 
  - Mbstring:
 +  . Fixed bug #69267 (mb_strtolower fails on titlecase characters). (Nikita)
    . Fixed bug #71606 (Segmentation fault mb_strcut with HTML-ENTITIES encoding).
      (cmb)