mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 02:15:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.6' into PHP-7.0

Browse Source 
* PHP-5.6:
  Fix Bug #72992 mbstring.internal_encoding doesn't inherit default_charset
This commit is contained in:
Yasuo Ohgaki 2016-09-08 13:32:31 +09:00
commit 379d9a1cfc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/mbstring/mbstring.c
View File

@ -1250,7 +1250,7 @@ static PHP_INI_MH(OnUpdate_mbstring_http_input)
const mbfl_encoding **list; const mbfl_encoding **list;
size_t size; size_t size;
if (!new_value) { if (!new_value || !ZSTR_VAL(new_value)) {
if (MBSTRG(http_input_list)) { if (MBSTRG(http_input_list)) {
pefree(MBSTRG(http_input_list), 1); pefree(MBSTRG(http_input_list), 1);
} }
@ -1318,7 +1318,7 @@ int _php_mb_ini_mbstring_internal_encoding_set(const char *new_value, uint new_v
{ {
const mbfl_encoding *encoding; const mbfl_encoding *encoding;
if (!new_value || new_value_length == 0 || !(encoding = mbfl_name2encoding(new_value))) { if (!new_value || !new_value_length || !(encoding = mbfl_name2encoding(new_value))) {
/* falls back to UTF-8 if an unknown encoding name is given */ /* falls back to UTF-8 if an unknown encoding name is given */
encoding = mbfl_no2encoding(mbfl_no_encoding_utf8); encoding = mbfl_no2encoding(mbfl_no_encoding_utf8);
} }