]> granicus.if.org Git - php/commitdiff
Make --enable-safe-mode useful
authorYasuo Ohgaki <yohgaki@php.net>
Sat, 19 Jan 2002 03:15:03 +0000 (03:15 +0000)
committerYasuo Ohgaki <yohgaki@php.net>
Sat, 19 Jan 2002 03:15:03 +0000 (03:15 +0000)
# It seems this option is broken for a long time.
@ Fix --enable-safe-mode. This configure option was not working.

main/main.c

index 9483f4251c4e59ca0c35087a3367657318d936f4..296b2d687ea18317c29b29f18463edde79981357 100644 (file)
@@ -231,7 +231,11 @@ PHP_INI_BEGIN()
        STD_PHP_INI_ENTRY("output_handler",                     NULL,           PHP_INI_PERDIR|PHP_INI_SYSTEM,OnUpdateString,   output_handler,         php_core_globals,       core_globals)
        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)
+#if PHP_SAFE_MODE
+       STD_PHP_INI_BOOLEAN("safe_mode",                        "1",            PHP_INI_SYSTEM,         OnUpdateBool,                   safe_mode,                              php_core_globals,       core_globals)
+#else
        STD_PHP_INI_BOOLEAN("safe_mode",                        "0",            PHP_INI_SYSTEM,         OnUpdateBool,                   safe_mode,                              php_core_globals,       core_globals)
+#endif
        STD_PHP_INI_ENTRY("safe_mode_include_dir",      NULL,           PHP_INI_SYSTEM,         OnUpdateString,                 safe_mode_include_dir,  php_core_globals,       core_globals)
        STD_PHP_INI_BOOLEAN("safe_mode_gid",                    "0",            PHP_INI_SYSTEM,         OnUpdateBool,                   safe_mode_gid,                          php_core_globals,       core_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)