cvs: php4(PHP_4_3) /main main.c
| From: | Jani Taskinen | Date: | Mon, 28 Apr 2003 21:00:41 +0000 |
| Subject: | cvs: php4(PHP_4_3) /main main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-20562@lists.php.net to get a copy of this message | ||
sniper Mon Apr 28 17:00:41 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/main main.c
Log:
MFH
Index: php4/main/main.c
diff -u php4/main/main.c:1.512.2.24 php4/main/main.c:1.512.2.25
--- php4/main/main.c:1.512.2.24 Thu Apr 24 14:25:47 2003
+++ php4/main/main.c Mon Apr 28 17:00:41 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.512.2.24 2003/04/24 18:25:47 ddhill Exp $ */
+/* $Id: main.c,v 1.512.2.25 2003/04/28 21:00:41 sniper Exp $ */
/* {{{ includes
*/
@@ -266,8 +266,8 @@
* PHP_INCLUDE_PATH
*/
-#ifndef SAFE_MODE_EXEC_DIR
-# define SAFE_MODE_EXEC_DIR "/"
+#ifndef PHP_SAFE_MODE_EXEC_DIR
+# define PHP_SAFE_MODE_EXEC_DIR ""
#endif
#ifdef PHP_PROG_SENDMAIL
@@ -339,7 +339,7 @@
STD_PHP_INI_ENTRY("include_path", PHP_INCLUDE_PATH, PHP_INI_ALL, OnUpdateStringUnempty, include_path, php_core_globals, core_globals)
PHP_INI_ENTRY("max_execution_time", "30", PHP_INI_ALL, OnUpdateTimeout)
STD_PHP_INI_ENTRY("open_basedir", NULL, PHP_INI_SYSTEM, OnUpdateString, open_basedir, php_core_globals, core_globals)
- STD_PHP_INI_ENTRY("safe_mode_exec_dir", "", PHP_INI_SYSTEM, OnUpdateString, safe_mode_exec_dir, php_core_globals, core_globals)
+ STD_PHP_INI_ENTRY("safe_mode_exec_dir", PHP_SAFE_MODE_EXEC_DIR, PHP_INI_SYSTEM, OnUpdateString, safe_mode_exec_dir, php_core_globals, core_globals)
STD_PHP_INI_BOOLEAN("file_uploads", "1", PHP_INI_SYSTEM, OnUpdateBool, file_uploads, php_core_globals, core_globals)
STD_PHP_INI_ENTRY("upload_max_filesize", "2M", PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateInt, upload_max_filesize, php_core_globals, core_globals)