summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfoobar <sniper@php.net>2001-04-06 15:18:52 +0000
committerfoobar <sniper@php.net>2001-04-06 15:18:52 +0000
commit216645147211a5f63c26fea4677633db7a0b3aef (patch)
treea2bfa52efe7c5933fe9a8cbd264c1211a866d3b6
parent0cae755c9b0ab479f68511b1f9c48dca3b05c2dd (diff)
downloadphp-git-216645147211a5f63c26fea4677633db7a0b3aef.tar.gz
Support also old arg_separator directive.
-rw-r--r--main/main.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/main/main.c b/main/main.c
index fd3e61c27d..e6b71acd94 100644
--- a/main/main.c
+++ b/main/main.c
@@ -139,6 +139,18 @@ static void php_disable_functions()
}
+static PHP_INI_MH(OnUpdateDeprecated)
+{
+ PLS_FETCH();
+
+ PG(arg_separator.output) = new_value;
+
+ if (stage==PHP_INI_STAGE_RUNTIME) {
+ php_error(E_WARNING, "The arg_separator directive is deprecated. Use arg_separator.output instead");
+ }
+ return SUCCESS;
+}
+
static PHP_INI_MH(OnUpdateTimeout)
{
ELS_FETCH();
@@ -211,6 +223,7 @@ PHP_INI_BEGIN()
STD_PHP_INI_ENTRY("arg_separator.output", "&", PHP_INI_ALL, OnUpdateStringUnempty, arg_separator.output, php_core_globals, core_globals)
STD_PHP_INI_ENTRY("arg_separator.input", "&", PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateStringUnempty, arg_separator.input, php_core_globals, core_globals)
+ PHP_INI_ENTRY("arg_separator", "&", PHP_INI_ALL, OnUpdateDeprecated)
STD_PHP_INI_ENTRY("auto_append_file", NULL, PHP_INI_ALL, OnUpdateString, auto_append_file, php_core_globals, core_globals)
STD_PHP_INI_ENTRY("auto_prepend_file", NULL, PHP_INI_ALL, OnUpdateString, auto_prepend_file, php_core_globals, core_globals)