Fixed: http://www.php.net/bugs.php?id=10733&edit=1

diff --git a/configure.in b/configure.in
index a63e8569293fa06db77ec42bcfde509329570825..0de6901fa578421478b36b5638715932ec76644b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -589,9 +589,9 @@ PHP_ARG_ENABLE(short-tags,whether to enable short tags by default,
 [  --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
 
 

diff --git a/main/main.c b/main/main.c
index cbc8c38ad94b7bf74d69036782766c37fd165604..c6828c806dd41a818ae643395deea2832fb1c59a 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -155,7 +155,6 @@ static PHP_INI_MH(OnUpdateTimeout)
 
 
 /* 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 @@ PHP_INI_BEGIN()
        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)