com php-src: Merge branch 'PHP-7.0' into PHP-7.1: NEWS ext/mbstring/php_mbregex.c
| From: | Christoph Michael Becker | Date: | Thu, 28 Jul 2016 12:09:29 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.0' into PHP-7.1: NEWS ext/mbstring/php_mbregex.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93448@lists.php.net to get a copy of this message | ||
Commit: 6aaef1ed346fcc7f9dad58e47f6418d36c3cbe73
Author: Christoph M. Becker <cmb@php.net> Thu, 28 Jul 2016 14:08:31 +0200
Parents: db69ea32cb283641eba86742de36d7eb9bd485ea a621023168ee00104dac20c996df3c9e8ad8edcf
Branches: PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6aaef1ed346fcc7f9dad58e47f6418d36c3cbe73
Log:
Merge branch 'PHP-7.0' into PHP-7.1
Changed paths:
MM NEWS
MM ext/mbstring/php_mbregex.c
Diff:
diff --cc NEWS
index c58c2fd,3fe60ff..1e346f0
--- 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)