diff options
| author | Yasuo Ohgaki <yohgaki@php.net> | 2014-05-12 13:34:43 +0900 |
|---|---|---|
| committer | Yasuo Ohgaki <yohgaki@php.net> | 2014-05-12 13:34:43 +0900 |
| commit | a33a817f0ed6f61878188fc28a33aa458fe464b9 (patch) | |
| tree | a2cb028ec3f7399bb2b28a024bb9653000eb1d69 /ext/mbstring/php_mbregex.c | |
| parent | eaa39c9388dc3604287e36ab6c438ad0a61f9f23 (diff) | |
| parent | 997be125eb0228c5b1b6dd278f617791e71192c6 (diff) | |
| download | php-git-a33a817f0ed6f61878188fc28a33aa458fe464b9.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed bug #67199 mb_regex_encoding mishmash
Diffstat (limited to 'ext/mbstring/php_mbregex.c')
| -rw-r--r-- | ext/mbstring/php_mbregex.c | 4 |
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; |