Make use of --with-exec-dir for real..

diff --git a/main/main.c b/main/main.c
index 1f1be3de87c8c530b074fd844a26a6daea34e615..bb32982d2e3cf1eea806e20fec85281e5a2cfe27 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -244,8 +244,8 @@ static PHP_INI_MH(OnUpdateTimeout)
  * 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 @@ PHP_INI_BEGIN()
        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)