From: Christoph M. Becker <cmb@php.net>
Date: Thu, 28 Jul 2016 11:59:13 +0000 (+0200)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.10RC1~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a621023168ee00104dac20c996df3c9e8ad8edcf;p=php

Merge branch 'PHP-5.6' into PHP-7.0
---

a621023168ee00104dac20c996df3c9e8ad8edcf
diff --cc NEWS
index d7a956990f,7a0e890869..3fe60ff8ea
--- a/NEWS
+++ b/NEWS
@@@ -61,14 -44,11 +61,16 @@@ 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)
 +
  - PCRE:
    . Fixed bug #72688 (preg_match missing group names in matches). (cmb)
 +  . Upgraded to PCRE 8.39. (Anatol)
  
  - PDO_pgsql:
    . Fixed bug #70313 (PDO statement fails to throw exception). (Matteo)