From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Sat, 25 Aug 2018 15:49:39 +0000 (+0200)
Subject: Merge branch 'PHP-7.2' into PHP-7.3
X-Git-Tag: php-7.3.0beta3~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b5afc99afb3374e1f1c76542ba188c8d38de3a81;p=php

Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #60494: iconv_mime_decode does ignore special characters
---

b5afc99afb3374e1f1c76542ba188c8d38de3a81
diff --cc NEWS
index b055777bb3,ed18c166f0..c73d79e5b9
--- a/NEWS
+++ b/NEWS
@@@ -19,8 -18,12 +19,9 @@@ PH
  - iconv:
    . Fixed bug #63839 (iconv_mime_decode_headers function is skipping headers).
      (cmb)
+   . Fixed bug #60494 (iconv_mime_decode does ignore special characters). (cmb)
    . Fixed bug #55146 (iconv_mime_decode_headers() skips some headers). (cmb)
 -
 -- intl:
 -  . Fixed bug #74484 (MessageFormatter::formatMessage memory corruption with
 -    11+ named placeholders). (Anatol)
 +  . Fixed bug #53891 (iconv_mime_encode() fails to Q-encode UTF-8 string). (cmb)
  
  - libxml:
    . Fixed bug #76777 ("public id" parameter of libxml_set_external_entity_loader