diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2014-08-29 10:36:58 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2014-08-29 10:36:58 +0400 |
| commit | ac19054b5825e461e468af015cb315a4f3714354 (patch) | |
| tree | 829bfde30351d488746f83fd521be44758006cba /ext/mbstring/php_mbregex.c | |
| parent | af1225d692046f86b2a636b06bf7ebccfde45201 (diff) | |
| parent | 4eb6c8234dd6085e3c96a5ebca86b1d70ac481e3 (diff) | |
| download | php-ac19054b5825e461e468af015cb315a4f3714354.tar.gz | |
Merge branch 'master-5.6' of git://anonscm.debian.org/pkg-php/php
Conflicts:
debian/changelog
debian/control
debian/patches/series
debian/php5-fpm.logrotate
debian/rules
Diffstat (limited to 'ext/mbstring/php_mbregex.c')
| -rw-r--r-- | ext/mbstring/php_mbregex.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c index 607921ebb..9ea297039 100644 --- a/ext/mbstring/php_mbregex.c +++ b/ext/mbstring/php_mbregex.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2013 The PHP Group | + | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -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; |