Fix mbstring input_filter

diff --git a/ext/mbstring/mb_gpc.c b/ext/mbstring/mb_gpc.c
index 61e6dd93d91d2409746f325727c17d602a42f306..90031505373dc3025b9db2ca260db3f83ef9175b 100644 (file)
--- a/ext/mbstring/mb_gpc.c
+++ b/ext/mbstring/mb_gpc.c
@@ -379,7 +379,7 @@ SAPI_POST_HANDLER_FUNC(php_mb_post_handler)
 {
        MBSTRG(http_input_identify_post) = mbfl_no_encoding_invalid;
 
-       _php_mb_encoding_handler_ex(arg, SG(request_info).post_data, "&", 0, 0 TSRMLS_CC);
+       _php_mb_encoding_handler_ex(PARSE_POST, arg, SG(request_info).post_data, "&", 0, 0 TSRMLS_CC);
 
        if (MBSTRG(http_input_identify) != mbfl_no_encoding_invalid) {
                MBSTRG(http_input_identify_post) = MBSTRG(http_input_identify);

diff --git a/ext/mbstring/mb_gpc.h b/ext/mbstring/mb_gpc.h
index 05d9c145ebbc2b15dfde4b336a15fd6f553747f5..c8a847cb2118182434298331b7171166e47f3ae4 100644 (file)
--- a/ext/mbstring/mb_gpc.h
+++ b/ext/mbstring/mb_gpc.h
@@ -33,7 +33,7 @@ SAPI_POST_HANDLER_FUNC(php_mb_post_handler);
 MBSTRING_API SAPI_TREAT_DATA_FUNC(mbstr_treat_data);
 
 int _php_mb_enable_encoding_translation(int flag);
-int _php_mb_encoding_handler_ex(zval *arg, char *res, char *separator, int force_register_globals, int report_errors TSRMLS_DC);
+int _php_mb_encoding_handler_ex(int data_type, zval *arg, char *res, char *separator, int force_register_globals, int report_errors TSRMLS_DC);
 /* }}} */
 #endif /* HAVE_MBSTRING */