com php-src: Merge branch 'PHP-5.6' into PHP-7.0: NEWS ext/mbstring/php_mbregex.c

Commit: 18a37eeeece3c8ff88a5c9fff0bc3871cbe37c17 Author: Christoph M. Becker <cmb@php.net> Thu, 28 Jul 2016 13:09:09 +0200 Parents: c7a4e37d9771ec212ad58fa344b380cbe6aa92a1 d276e6a8386a68d57d5dd07c3d7e15de4b03c6b3 Branches: PHP-7.0 PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=18a37eeeece3c8ff88a5c9fff0bc3871cbe37c17 Log: Merge branch 'PHP-5.6' into PHP-7.0 # Resolved conflicts: # ext/mbstring/php_mbregex.c Changed paths: MM NEWS MM ext/mbstring/php_mbregex.c Diff: diff --cc NEWS index 0be5511,962be02..d7a9569 --- a/NEWS +++ b/NEWS @@@ -58,13 -41,12 +58,17 @@@ PH . Partially fixed #72506 (idn_to_ascii for UTS #46 incorrect for long domain names). (cmb) + - 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) + - 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) diff --cc ext/mbstring/php_mbregex.c index 573a5e9,3509165..95932e3 --- a/ext/mbstring/php_mbregex.c +++ b/ext/mbstring/php_mbregex.c @@@ -1243,12 -1232,9 +1243,9 @@@ _php_mb_regex_ereg_search_exec(INTERNAL } else if (err <= -2) { OnigUChar err_str[ONIG_MAX_ERROR_MESSAGE_LEN]; onig_error_code_to_str(err_str, err); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "mbregex search failure in mbregex_search(): %s", err_str); + php_error_docref(NULL, E_WARNING, "mbregex search failure in mbregex_search(): %s", err_str); RETVAL_FALSE; } else { - if (MBREX(search_regs)->beg[0] == MBREX(search_regs)->end[0]) { - php_error_docref(NULL, E_WARNING, "Empty regular expression"); - } switch (mode) { case 1: array_init(return_value);