From: Rui Hirokawa <hirokawa@php.net>
Date: Sat, 6 Aug 2011 12:19:33 +0000 (+0000)
Subject: MFH: fixed encoding conversion when http_input=auto.
X-Git-Tag: php-5.4.0beta1~518
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=786d8e7bc2426631af647b11af559482d92cff69;p=php

MFH: fixed encoding conversion when http_input=auto.
---

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];