cvs: php4 / configure.in /main main.c

sniper Tue May 8 13:11:47 2001 EDT Modified files: /php4 configure.in /php4/main main.c Log: Fixed: http://www.php.net/bugs.php?id=10733&edit=1 Index: php4/configure.in diff -u php4/configure.in:1.240 php4/configure.in:1.241 --- php4/configure.in:1.240 Sun May 6 16:16:33 2001 +++ php4/configure.in Tue May 8 13:11:46 2001 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.240 2001/05/06 23:16:33 ssb Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.241 2001/05/08 20:11:46 sniper Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -589,9 +589,9 @@ [ --disable-short-tags Disable the short-form <? start tag by default.],yes) if test "$PHP_SHORT_TAGS" = "yes"; then - AC_DEFINE(DEFAULT_SHORT_OPEN_TAG,1,[ ]) + AC_DEFINE(DEFAULT_SHORT_OPEN_TAG,"1",[ ]) else - AC_DEFINE(DEFAULT_SHORT_OPEN_TAG,0,[ ]) + AC_DEFINE(DEFAULT_SHORT_OPEN_TAG,"0",[ ]) fi Index: php4/main/main.c diff -u php4/main/main.c:1.364 php4/main/main.c:1.365 --- php4/main/main.c:1.364 Sun May 6 08:22:22 2001 +++ php4/main/main.c Tue May 8 13:11:46 2001 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.364 2001/05/06 15:22:22 sniper Exp $ */ +/* $Id: main.c,v 1.365 2001/05/08 20:11:46 sniper Exp $ */ #include <stdio.h> @@ -155,7 +155,6 @@ /* Need to convert to strings and make use of: - * DEFAULT_SHORT_OPEN_TAG * PHP_SAFE_MODE * * Need to be read from the environment (?): @@ -202,7 +201,7 @@ STD_PHP_INI_BOOLEAN("register_argc_argv", "1", PHP_INI_ALL, OnUpdateBool, register_argc_argv, php_core_globals, core_globals) STD_PHP_INI_BOOLEAN("register_globals", "1", PHP_INI_ALL, OnUpdateBool, register_globals, php_core_globals, core_globals) STD_PHP_INI_BOOLEAN("safe_mode", "0", PHP_INI_SYSTEM, OnUpdateBool, safe_mode, php_core_globals, core_globals) - 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("short_open_tag",DEFAULT_SHORT_OPEN_TAG, 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) STD_PHP_INI_BOOLEAN("y2k_compliance", "0", PHP_INI_ALL, OnUpdateBool, y2k_compliance, php_core_globals, core_globals)