From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Wed, 14 Nov 2018 13:56:41 +0000 (+0100)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.3.0RC6~14^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=211c6189f6921c17ec55a3b422ab5fa4bdd5e88f;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix #77147: Fix for 60494 ignores ICONV_MIME_DECODE_CONTINUE_ON_ERROR
---

211c6189f6921c17ec55a3b422ab5fa4bdd5e88f
diff --cc NEWS
index cb22af2c77,dbb7c1fff9..5731c63ddf
--- a/NEWS
+++ b/NEWS
@@@ -1,11 -1,11 +1,15 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2018, PHP 7.1.25
 +?? ??? 2018, PHP 7.2.13
 +
 +- Fileinfo:
 +  . Fixed bug #77095 (slowness regression in 7.2/7.3 (compared to 7.1)).
 +    (Anatol)
  
+ - iconv:
+   . Fixed bug #77147 (Fixing 60494 ignored ICONV_MIME_DECODE_CONTINUE_ON_ERROR).
+     (cmb)
+ 
  - ODBC:
    . Fixed bug #77079 (odbc_fetch_object has incorrect type signature).
      (Jon Allen)