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

Merge branch 'PHP-5.6' into PHP-7.0

# Resolved conflicts:
#	ext/mbstring/php_mbregex.c
---

18a37eeeece3c8ff88a5c9fff0bc3871cbe37c17
diff --cc NEWS
index 0be5511053,962be02581..d7a956990f
--- 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 573a5e9b9c,3509165ca9..95932e31ae
--- 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);