cvs: php4 /main main.c
| From: | Yasuo Ohgaki | Date: | Sat, 19 Jan 2002 03:15:03 +0000 |
| Subject: | cvs: php4 /main main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-9092@lists.php.net to get a copy of this message | ||
yohgaki Fri Jan 18 22:15:03 2002 EDT
Modified files:
/php4/main main.c
Log:
Make --enable-safe-mode useful
# It seems this option is broken for a long time.
@ Fix --enable-safe-mode. This configure option was not working.
Index: php4/main/main.c
diff -u php4/main/main.c:1.418 php4/main/main.c:1.419
--- php4/main/main.c:1.418 Thu Jan 10 11:00:08 2002
+++ php4/main/main.c Fri Jan 18 22:15:03 2002
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.418 2002/01/10 16:00:08 derick Exp $ */
+/* $Id: main.c,v 1.419 2002/01/19 03:15:03 yohgaki Exp $ */
/* {{{ includes
*/
@@ -231,7 +231,11 @@
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)