com php-src: Fixed bug #67199 mb_regex_encodi ng mishmash: ext/mbstring/php_mbregex.c

Commit: 997be125eb0228c5b1b6dd278f617791e71192c6 Author: Yasuo Ohgaki <yohgaki@php.net> Mon, 12 May 2014 13:33:53 +0900 Parents: f2fdeba19d37080ddc27198a0879bb0254684c5b Branches: PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=997be125eb0228c5b1b6dd278f617791e71192c6 Log: Fixed bug #67199 mb_regex_encoding mishmash Bugs: https://bugs.php.net/67199 Changed paths: M ext/mbstring/php_mbregex.c Diff: diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c index 4b1b924..9ea2970 100644 --- a/ext/mbstring/php_mbregex.c +++ b/ext/mbstring/php_mbregex.c @@ -64,8 +64,8 @@ static void php_mb_regex_free_cache(php_mb_regex_t **pre) /* {{{ _php_mb_regex_globals_ctor */ static int _php_mb_regex_globals_ctor(zend_mb_regex_globals *pglobals TSRMLS_DC) { - pglobals->default_mbctype = ONIG_ENCODING_EUC_JP; - pglobals->current_mbctype = ONIG_ENCODING_EUC_JP; + pglobals->default_mbctype = ONIG_ENCODING_UTF8; + pglobals->current_mbctype = ONIG_ENCODING_UTF8; zend_hash_init(&(pglobals->ht_rc), 0, NULL, (void (*)(void *)) php_mb_regex_free_cache, 1); pglobals->search_str = (zval*) NULL; pglobals->search_re = (php_mb_regex_t*)NULL;