mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-24 04:33:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reduced overhead of ext/mbstring initialization

Browse Source
This commit is contained in:
Dmitry Stogov 2010-07-05 12:03:08 +00:00
parent ab67865d21
commit b65f1dae41
2 changed files with 14 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
ext/mbstring/mbstring.c
View File

@ -1051,58 +1051,42 @@ static PHP_INI_MH(OnUpdate_mbstring_http_output)
int _php_mb_ini_mbstring_internal_encoding_set(const char *new_value, uint new_value_length TSRMLS_DC)
{
enum mbfl_no_encoding no_encoding;
const char *enc_name = NULL;
uint enc_name_len = 0;
no_encoding = new_value ? mbfl_name2no_encoding(new_value):
mbfl_no_encoding_invalid;
if (no_encoding != mbfl_no_encoding_invalid) {
enc_name = new_value;
enc_name_len = new_value_length;
} else {
if (!new_value
|| !*new_value
|| (no_encoding = mbfl_name2no_encoding(new_value)) == mbfl_no_encoding_invalid) {
switch (MBSTRG(language)) {
case mbfl_no_language_uni:
enc_name = "UTF-8";
enc_name_len = sizeof("UTF-8") - 1;
no_encoding = mbfl_no_encoding_utf8;
break;
case mbfl_no_language_japanese:
enc_name = "EUC-JP";
enc_name_len = sizeof("EUC-JP") - 1;
no_encoding = mbfl_no_encoding_euc_jp;
break;
case mbfl_no_language_korean:
enc_name = "EUC-KR";
enc_name_len = sizeof("EUC-KR") - 1;
no_encoding = mbfl_no_encoding_euc_kr;
break;
case mbfl_no_language_simplified_chinese:
enc_name = "EUC-CN";
enc_name_len = sizeof("EUC-CN") - 1;
no_encoding = mbfl_no_encoding_euc_cn;
break;
case mbfl_no_language_traditional_chinese:
enc_name = "EUC-TW";
enc_name_len = sizeof("EUC-TW") - 1;
no_encoding = mbfl_no_encoding_euc_tw;
break;
case mbfl_no_language_russian:
enc_name = "KOI8-R";
enc_name_len = sizeof("KOI8-R") - 1;
no_encoding = mbfl_no_encoding_koi8r;
break;
case mbfl_no_language_german:
enc_name = "ISO-8859-15";
enc_name_len = sizeof("ISO-8859-15") - 1;
no_encoding = mbfl_no_encoding_8859_15;
break;
case mbfl_no_language_armenian:
enc_name = "ArmSCII-8";
enc_name_len = sizeof("ArmSCII-8") - 1;
no_encoding = mbfl_no_encoding_armscii8;
break;
case mbfl_no_language_turkish:
enc_name = "ISO-8859-9";
enc_name_len = sizeof("ISO-8859-9") - 1;
no_encoding = mbfl_no_encoding_8859_9;
break;
default:
enc_name = "ISO-8859-1";
enc_name_len = sizeof("ISO-8859-1") - 1;
no_encoding = mbfl_no_encoding_8859_1;
break;
}
no_encoding = mbfl_name2no_encoding(enc_name);
}
MBSTRG(internal_encoding) = no_encoding;
MBSTRG(current_internal_encoding) = no_encoding;

2
ext/mbstring/php_mbregex.c
View File

@ -372,7 +372,7 @@ static OnigEncoding _php_mb_regex_name2mbctype(const char *pname)
const char *p;
php_mb_regex_enc_name_map_t *mapping;
if (pname == NULL) {
if (pname == NULL || !*pname) {
return ONIG_ENCODING_UNDEF;
}