php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-27 01:32:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

- MFH: More fixes for bug #45691

Browse Source
This commit is contained in:
Moriyoshi Koizumi
2008-08-04 21:06:13 +00:00
parent 07a3075251
commit 970e00aeeb
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ext/mbstring/mbstring.c
View File

@@ -1394,6 +1394,11 @@ static PHP_INI_MH(OnUpdate_mbstring_substitute_character)
}
}
}
} else {
MBSTRG(filter_illegal_mode) = MBFL_OUTPUTFILTER_ILLEGAL_MODE_CHAR;
MBSTRG(current_filter_illegal_mode) = MBFL_OUTPUTFILTER_ILLEGAL_MODE_CHAR;
MBSTRG(filter_illegal_substchar) = 0x3f; /* '?' */
MBSTRG(current_filter_illegal_substchar) = 0x3f; /* '?' */
}
return SUCCESS;
@@ -1429,7 +1434,8 @@ static PHP_INI_MH(OnUpdate_mbstring_http_output_conv_mimetypes)
void *re = NULL;
if (!new_value) {
return SUCCESS;
new_value = entry->orig_value;
new_value_length = entry->orig_value_length;
}
php_trim(new_value, new_value_length, NULL, 0, &tmp, 3 TSRMLS_CC);
@@ -1604,9 +1610,7 @@ PHP_RINIT_FUNCTION(mbstring)
MBSTRG(current_filter_illegal_mode) = MBSTRG(filter_illegal_mode);
MBSTRG(current_filter_illegal_substchar) = MBSTRG(filter_illegal_substchar);
if (!MBSTRG(encoding_translation)) {
MBSTRG(illegalchars) = 0;
}
MBSTRG(illegalchars) = 0;
n = 0;
if (MBSTRG(detect_order_list)) {