From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Mon, 19 Mar 2018 13:25:44 +0000 (+0100)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.5RC1~39
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cd2912af5ead4174cb8e3e91a755e471fd7ec08a;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix #75944: Wrong cp1251 detection
---

cd2912af5ead4174cb8e3e91a755e471fd7ec08a
diff --cc NEWS
index 4882f007b4,921d9123d1..8ae7464cfd
--- a/NEWS
+++ b/NEWS
@@@ -1,18 -1,12 +1,21 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? ????, PHP 7.1.17
 +?? ??? 2018, PHP 7.2.5
  
+ - Mbstring:
+   . Fixed bug #75944 (Wrong cp1251 detection). (dmk001)
+ 
 +- ODBC:
 +  . Fixed bug #76088 (ODBC functions are not available by default on Windows).
 +    (cmb)
 +
 +- Opcache:
 +  . Fixed bug #76094 (Access violation when using opcache). (Laruence)
 +
 +- Standard:
 +  . Fixed bug #74139 (mail.add_x_header default inconsistent with docs). (cmb)
  
 -29 Mar 2018, PHP 7.1.16
 +29 Mar 2018, PHP 7.2.4
  
  - Core:
    . Fixed bug #76025 (Segfault while throwing exception in error_handler).