From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Mon, 29 Jul 2019 06:50:17 +0000 (+0200)
Subject: Merge branch 'PHP-7.2' into PHP-7.3
X-Git-Tag: php-7.4.0beta2~34^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=585131f9018215e42303be82ce58ea3941a911b2;p=php

Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #78342: Bus error in configure test for iconv //IGNORE
---

585131f9018215e42303be82ce58ea3941a911b2
diff --cc NEWS
index 4d238f8b0a,b32589d7c2..0df696d870
--- a/NEWS
+++ b/NEWS
@@@ -6,10 -6,10 +6,14 @@@ PH
    . Fixed bug #77946 (Bad cURL resources returned by curl_multi_info_read()).
      (Abyr Valg)
  
 +- FPM:
 +  . Fixed bug #77185 (Use-after-free in FPM master event handling).
 +    (Maksim Nikulin)
 +
+ - Iconv:
+   . Fixed bug #78342 (Bus error in configure test for iconv //IGNORE). (Rainer
+     Jung)
+ 
  - LiteSpeed:
    . Updated to LiteSpeed SAPI V7.5 (Fixed clean shutdown). (George Wang)