diff options
Diffstat (limited to 'ext/standard/basic_functions.c')
| -rw-r--r-- | ext/standard/basic_functions.c | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 90f425b958..4ed1a2d8cf 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -194,11 +194,6 @@ function_entry basic_functions[] = { PHP_NAMED_FE(printf, PHP_FN(user_printf), NULL) PHP_FE(sscanf, third_and_rest_force_ref) PHP_FE(fscanf, third_and_rest_force_ref) -#ifdef HAVE_ICONV - PHP_FE(iconv, NULL) - PHP_FE(ob_iconv_handler, NULL) - PHP_FE(iconv_set_encoding, NULL) -#endif PHP_FE(parse_url, NULL) PHP_FE(urlencode, NULL) PHP_FE(urldecode, NULL) @@ -602,38 +597,9 @@ static PHP_INI_MH(OnUpdateSafeModeAllowedEnvVars) return SUCCESS; } -#ifdef HAVE_ICONV -static PHP_INI_MH(OnUpdateIconvOutputEncoding) -{ - BLS_FETCH(); - - if (BG(iconv_output_encoding)) { - free(BG(iconv_output_encoding)); - } - BG(iconv_output_encoding) = zend_strndup(new_value, new_value_length); - return SUCCESS; -} - -static PHP_INI_MH(OnUpdateIconvInternalEncoding) -{ - BLS_FETCH(); - - if (BG(iconv_internal_encoding)) { - free(BG(iconv_internal_encoding)); - } - BG(iconv_internal_encoding) = zend_strndup(new_value, new_value_length); - return SUCCESS; -} - -#endif - PHP_INI_BEGIN() PHP_INI_ENTRY_EX("safe_mode_protected_env_vars", SAFE_MODE_PROTECTED_ENV_VARS, PHP_INI_SYSTEM, OnUpdateSafeModeProtectedEnvVars, NULL) PHP_INI_ENTRY_EX("safe_mode_allowed_env_vars", SAFE_MODE_ALLOWED_ENV_VARS, PHP_INI_SYSTEM, OnUpdateSafeModeAllowedEnvVars, NULL) -#ifdef HAVE_ICONV - PHP_INI_ENTRY_EX("iconv.output_encoding", ICONV_OUTPUT_ENCODING, PHP_INI_SYSTEM, OnUpdateIconvOutputEncoding, NULL) - PHP_INI_ENTRY_EX("iconv.internal_encoding", ICONV_INTERNAL_ENCODING, PHP_INI_SYSTEM, OnUpdateIconvInternalEncoding, NULL) -#endif STD_PHP_INI_ENTRY("session.use_trans_sid", "1", PHP_INI_ALL, OnUpdateBool, use_trans_sid, php_basic_globals, basic_globals) PHP_INI_END() |