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

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

db69ea32cb283641eba86742de36d7eb9bd485ea
diff --cc NEWS
index 56e91e3d86,d7a956990f..c58c2fd724
--- a/NEWS
+++ b/NEWS
@@@ -17,12 -35,36 +17,16 @@@ PH
  - Intl:
    . Fixed bug #72639 (Segfault when instantiating class that extends
      IntlCalendar and adds a property). (Laruence)
 -  . Partially fixed #72506 (idn_to_ascii for UTS #46 incorrect for long domain
 -    names). (cmb)
 +  . Fixed bug #72658 (Locale::lookup() / locale_lookup() hangs if no match
 +    found). (Anatol)
  
+ - mbstring:
+   . Fixed bug #72691 (mb_ereg_search raises a warning if 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)