From: Yasuo Ohgaki <yohgaki@php.net>
Date: Mon, 12 May 2014 04:33:53 +0000 (+0900)
Subject: Fixed bug #67199	mb_regex_encoding mishmash
X-Git-Tag: PRE_PHPNG_MERGE~288^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=997be125eb0228c5b1b6dd278f617791e71192c6;p=php

Fixed bug #67199	mb_regex_encoding mishmash
---

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;