From: Christoph M. Becker <cmb@php.net>
Date: Sat, 30 Jul 2016 10:02:56 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0beta2~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9c2814313d26968bb3a53b3b1012ea6b2cfaa922;p=php

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

9c2814313d26968bb3a53b3b1012ea6b2cfaa922
diff --cc NEWS
index 89c0485b4f,babe2c23b0..c024d7ad37
--- a/NEWS
+++ b/NEWS
@@@ -33,11 -71,12 +33,13 @@@ PH
      zero-width). (cmb)
    . Fixed bug #72694 (mb_ereg_search_setpos does not accept a string's last
      position). (cmb)
+   . Fixed bug #72710 (`mb_ereg` causes buffer overflow on regexp compile error).
+     (ju1ius)
  
 -- 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)
 +  . Fixed bug #72701 (mysqli_get_host_info() wrong output). (Anatol)
  
  - PCRE:
    . Fixed bug #72688 (preg_match missing group names in matches). (cmb)