cvs: php4 / configure.in /main config.w32.h main.c

zeev Mon Jun 26 10:11:28 2000 EDT Modified files: /php4 configure.in /php4/main config.w32.h main.c Log: TRACK_VARS is really no longer necessary... Index: php4/configure.in diff -u php4/configure.in:1.154 php4/configure.in:1.155 --- php4/configure.in:1.154 Thu Jun 22 11:35:08 2000 +++ php4/configure.in Mon Jun 26 10:11:28 2000 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.154 2000/06/22 18:35:08 zeev Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.155 2000/06/26 17:11:28 zeev Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -482,15 +482,6 @@ AC_DEFINE(PHP_SIGCHILD, 1, [ ]) 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, Index: php4/main/config.w32.h diff -u php4/main/config.w32.h:1.28 php4/main/config.w32.h:1.29 --- php4/main/config.w32.h:1.28 Wed Jun 21 14:48:14 2000 +++ php4/main/config.w32.h Mon Jun 26 10:11:28 2000 @@ -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 Index: php4/main/main.c diff -u php4/main/main.c:1.273 php4/main/main.c:1.274 --- php4/main/main.c:1.273 Sun Jun 25 10:02:46 2000 +++ php4/main/main.c Mon Jun 26 10:11:28 2000 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.273 2000/06/25 17:02:46 zeev Exp $ */ +/* $Id: main.c,v 1.274 2000/06/26 17:11:28 zeev Exp $ */ #include <stdio.h> @@ -225,11 +225,7 @@ 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)