diff options
| author | Rui Hirokawa <hirokawa@php.net> | 2011-08-06 12:19:33 +0000 |
|---|---|---|
| committer | Rui Hirokawa <hirokawa@php.net> | 2011-08-06 12:19:33 +0000 |
| commit | 786d8e7bc2426631af647b11af559482d92cff69 (patch) | |
| tree | 2b0cdabd413437ac6a68556dd729c2b458f24f2a | |
| parent | 5709c83d930a58efe3de1a35c6e9fe17923c9ee9 (diff) | |
| download | php-git-786d8e7bc2426631af647b11af559482d92cff69.tar.gz | |
MFH: fixed encoding conversion when http_input=auto.
| -rw-r--r-- | ext/mbstring/mb_gpc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/mbstring/mb_gpc.c b/ext/mbstring/mb_gpc.c index 041227d15d..985a604ebb 100644 --- a/ext/mbstring/mb_gpc.c +++ b/ext/mbstring/mb_gpc.c @@ -264,8 +264,8 @@ const mbfl_encoding *_php_mb_encoding_handler_ex(const php_mb_encoding_handler_i } else { /* auto detect */ from_encoding = NULL; - identd = mbfl_encoding_detector_new((enum mbfl_no_encoding *)info->from_encodings, info->num_from_encodings, MBSTRG(strict_detection)); - if (identd) { + identd = mbfl_encoding_detector_new2(info->from_encodings, info->num_from_encodings, MBSTRG(strict_detection)); + if (identd != NULL) { n = 0; while (n < num) { string.val = (unsigned char *)val_list[n]; |