diff options
| author | Zeev Suraski <zeev@php.net> | 2000-06-26 17:11:28 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2000-06-26 17:11:28 +0000 |
| commit | 16c363182d9f82ad5fab7b6da3d8d190538d40ef (patch) | |
| tree | 48829d6036f4ad216dd11f4787ba2c0e7417312d | |
| parent | 0beee41fc60a91786111dcbf337bc7475693f6b0 (diff) | |
| download | php-git-16c363182d9f82ad5fab7b6da3d8d190538d40ef.tar.gz | |
TRACK_VARS is really no longer necessary...
| -rw-r--r-- | configure.in | 9 | ||||
| -rw-r--r-- | main/config.w32.h | 1 | ||||
| -rw-r--r-- | main/main.c | 4 |
3 files changed, 0 insertions, 14 deletions
diff --git a/configure.in b/configure.in index bdabc5faf9..fbef5b2887 100644 --- a/configure.in +++ b/configure.in @@ -484,15 +484,6 @@ else AC_DEFINE(PHP_SIGCHILD, 0, [ ]) fi -PHP_ARG_ENABLE(track-vars,whether to enable track_vars variables by default, -[ --enable-track-vars Enable GET/POST/Cookie track variables by default.],yes) - -if test "$PHP_TRACK_VARS" = "yes"; then - AC_DEFINE(PHP_TRACK_VARS, 1, [ ]) -else - AC_DEFINE(PHP_TRACK_VARS, 0, [ ]) -fi - PHP_ARG_ENABLE(magic-quotes,whether to enable magic quotes by default, [ --enable-magic-quotes Enable magic quotes by default.]) diff --git a/main/config.w32.h b/main/config.w32.h index 4f5efb3106..d60f17e5ea 100644 --- a/main/config.w32.h +++ b/main/config.w32.h @@ -46,7 +46,6 @@ /* this disables "<?expression?>" and "<?=expression?>" */ #define DEFAULT_SHORT_OPEN_TAG 1 -#define PHP_TRACK_VARS 1 /* ---------------------------------------------------------------- The following defines are for those modules which require diff --git a/main/main.c b/main/main.c index 99f89c5f6f..25af91836f 100644 --- a/main/main.c +++ b/main/main.c @@ -225,11 +225,7 @@ PHP_INI_BEGIN() STD_PHP_INI_BOOLEAN("short_open_tag", "1", PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateBool, short_tags, zend_compiler_globals, compiler_globals) STD_PHP_INI_BOOLEAN("sql.safe_mode", "0", PHP_INI_SYSTEM, OnUpdateBool, sql_safe_mode, php_core_globals, core_globals) STD_PHP_INI_BOOLEAN("track_errors", "0", PHP_INI_ALL, OnUpdateBool, track_errors, php_core_globals, core_globals) -#if PHP_TRACK_VARS /* "cc -32" on IRIX 6.4 does not like (PHP_TRACK_VARS?"1":"0") - thies 991004 */ STD_PHP_INI_BOOLEAN("track_vars", "1", PHP_INI_ALL, OnUpdateBool, track_vars, php_core_globals, core_globals) -#else - STD_PHP_INI_BOOLEAN("track_vars", "0", PHP_INI_ALL, OnUpdateBool, track_vars, php_core_globals, core_globals) -#endif STD_PHP_INI_BOOLEAN("y2k_compliance", "0", PHP_INI_ALL, OnUpdateBool, y2k_compliance, php_core_globals, core_globals) STD_PHP_INI_ENTRY("arg_separator", "&", PHP_INI_ALL, OnUpdateStringUnempty, arg_separator, php_core_globals, core_globals) |