From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Tue, 20 Mar 2018 15:52:42 +0000 (+0100)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.5RC1~38
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8f5c34cd399496f58bf91fe426444c6366db8df3;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix #76113: mbstring does not build with Oniguruma 6.8.1
---

8f5c34cd399496f58bf91fe426444c6366db8df3
diff --cc NEWS
index 8ae7464cfd,d9febf7349..1faf13831e
--- a/NEWS
+++ b/NEWS
@@@ -4,18 -4,11 +4,20 @@@ PH
  
  - Mbstring:
    . Fixed bug #75944 (Wrong cp1251 detection). (dmk001)
+   . Fixed bug #76113 (mbstring does not build with Oniguruma 6.8.1).
+     (chrullrich, cmb)
  
 +- 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).