diff options
| author | Rui Hirokawa <hirokawa@php.net> | 2011-08-06 12:19:16 +0000 |
|---|---|---|
| committer | Rui Hirokawa <hirokawa@php.net> | 2011-08-06 12:19:16 +0000 |
| commit | fc3e0ff1ec40d49dd5f9d5da78f3a9a8d16635b1 (patch) | |
| tree | 1bed49039a89255b995e20011ed2a6096fad869c | |
| parent | 70eb1c1267418756b5077357763c762317f4e0e1 (diff) | |
| download | php-git-fc3e0ff1ec40d49dd5f9d5da78f3a9a8d16635b1.tar.gz | |
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]; |