svn: /php/php-src/trunk/ext/mbstring/ mb_gpc.c
| From: | Rui Hirokawa | Date: | Sat, 06 Aug 2011 12:19:16 +0000 |
| Subject: | svn: /php/php-src/trunk/ext/mbstring/ mb_gpc.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-65714@lists.php.net to get a copy of this message | ||
hirokawa Sat, 06 Aug 2011 12:19:16 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=314369
Log:
fixed encoding conversion when http_input=auto.
Changed paths:
U php/php-src/trunk/ext/mbstring/mb_gpc.c
Modified: php/php-src/trunk/ext/mbstring/mb_gpc.c
===================================================================
--- php/php-src/trunk/ext/mbstring/mb_gpc.c 2011-08-06 09:58:55 UTC (rev 314368)
+++ php/php-src/trunk/ext/mbstring/mb_gpc.c 2011-08-06 12:19:16 UTC (rev 314369)
@@ -264,8 +264,8 @@
} 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];