From: Christoph M. Becker <cmb@php.net>
Date: Thu, 28 Jul 2016 12:08:31 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0beta2~43
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6aaef1ed346fcc7f9dad58e47f6418d36c3cbe73;p=php

Merge branch 'PHP-7.0' into PHP-7.1
---

6aaef1ed346fcc7f9dad58e47f6418d36c3cbe73
diff --cc NEWS
index c58c2fd724,3fe60ff8ea..1e346f0640
--- a/NEWS
+++ b/NEWS
@@@ -23,10 -61,12 +23,12 @@@ PH
  - mbstring:
    . Fixed bug #72691 (mb_ereg_search raises a warning if a match zero-width).
      (cmb)
+   . Fixed Bug #72693 (mb_ereg_search increments search position when a match
+     zero-width). (cmb)
  
 -- Opcache:
 -  . Fixed bug #72590 (Opcache restart with kill_all_lockers does not work).
 -    (Keyur)
 +- Mysqlnd:
 +  . Fixed bug #71863 (Segfault when EXPLAIN with "Unknown column" error when
 +    using MariaDB). (Andrey)
  
  - PCRE:
    . Fixed bug #72688 (preg_match missing group names in matches). (cmb)