Merge branch 'PHP-7.3'

cmb69 · cmb69 · commit 2fec8b1bedd0 · 2018-08-04T23:24:20.000+02:00
* PHP-7.3:
  Fix #76706: mbstring.http_output_conv_mimetypes is ignored
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
@@ -1068,7 +1068,7 @@ static int _php_mb_match_regex(void *opaque, const char *str, size_t str_len)
 		php_error_docref(NULL, E_WARNING, "Cannot allocate match data");
 		return FAILURE;
 	}
-	res = pcre2_match(opaque, (PCRE2_SPTR)str, str_len, 0, 0, match_data, php_pcre_mctx());
+	res = pcre2_match(opaque, (PCRE2_SPTR)str, str_len, 0, 0, match_data, php_pcre_mctx()) >= 0;
 	php_pcre_free_match_data(match_data);
 
 	return res;

Original file line number	Diff line number	Diff line change
`@@ -1068,7 +1068,7 @@ static int _php_mb_match_regex(void opaque, const char str, size_t str_len)`
`1068`	`1068`	`php_error_docref(NULL, E_WARNING, "Cannot allocate match data");`
`1069`	`1069`	`return FAILURE;`
`1070`	`1070`	`}`
`1071`		`- res = pcre2_match(opaque, (PCRE2_SPTR)str, str_len, 0, 0, match_data, php_pcre_mctx());`
	`1071`	`+ res = pcre2_match(opaque, (PCRE2_SPTR)str, str_len, 0, 0, match_data, php_pcre_mctx()) >= 0;`
`1072`	`1072`	`php_pcre_free_match_data(match_data);`
`1073`	`1073`
`1074`	`1074`	`return res;`