summaryrefslogtreecommitdiff
path: root/ext/mbstring
diff options
context:
space:
mode:
authorYasuo Ohgaki <yohgaki@php.net>2014-05-12 13:33:53 +0900
committerYasuo Ohgaki <yohgaki@php.net>2014-05-12 13:33:53 +0900
commit997be125eb0228c5b1b6dd278f617791e71192c6 (patch)
tree832b7895e73d19eee1c75825914487e126987f5d /ext/mbstring
parentf2fdeba19d37080ddc27198a0879bb0254684c5b (diff)
downloadphp-git-997be125eb0228c5b1b6dd278f617791e71192c6.tar.gz
Fixed bug #67199 mb_regex_encoding mishmash
Diffstat (limited to 'ext/mbstring')
-rw-r--r--ext/mbstring/php_mbregex.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c
index 4b1b924d06..9ea2970393 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;