cvs: php4 /main main.c

From: Date: Mon, 28 Apr 2003 21:00:32 +0000
Subject: cvs: php4 /main main.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-20561@lists.php.net to get a copy of this message
sniper Mon Apr 28 17:00:32 2003 EDT Modified files: /php4/main main.c Log: Make use of --with-exec-dir for real.. Index: php4/main/main.c diff -u php4/main/main.c:1.548 php4/main/main.c:1.549 --- php4/main/main.c:1.548 Fri Apr 25 06:57:23 2003 +++ php4/main/main.c Mon Apr 28 17:00:32 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.548 2003/04/25 10:57:23 sniper Exp $ */ +/* $Id: main.c,v 1.549 2003/04/28 21:00:32 sniper Exp $ */ /* {{{ includes */ @@ -244,8 +244,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 @@ -319,7 +319,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, OnUpdateLong, upload_max_filesize, php_core_globals, core_globals)

« previous php.cvs (#20561) next »