From 899477a9979e407ecda02be50be5ba6cfb46821f Mon Sep 17 00:00:00 2001 From: Justin Erenkrantz Date: Wed, 1 Jan 2003 00:14:33 +0000 Subject: [PATCH] Use saner default config values for suexec. OtherBill and Brad have confirmed that including ap_config_layout.h isn't a problem on non-Unix platforms as they don't use suexec. PR: 15713 Submitted by: Thom May Reviewed by: Justin Erenkrantz git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98134 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 4 ++++ support/suexec.h | 10 ++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 6dc7a4a561..f135a401c0 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,10 @@ Changes with Apache 2.1.0-dev [Remove entries to the current 2.0 section below, when backported] + + *) Use saner default config values for suexec. PR 15713. + [Thom May ] + *) Allow 'make depend' to work with non-GCC compilers. [Justin Erenkrantz] diff --git a/support/suexec.h b/support/suexec.h index 2342c16822..eaf507ca8d 100644 --- a/support/suexec.h +++ b/support/suexec.h @@ -61,6 +61,12 @@ #ifndef _SUEXEC_H #define _SUEXEC_H +/* + * Include ap_config_layout so we can work out where the default htdocsdir + * and logsdir are. + */ +#include "ap_config_layout.h" + /* * HTTPD_USER -- Define as the username under which Apache normally * runs. This is the only user allowed to execute @@ -117,7 +123,7 @@ * debugging purposes. */ #ifndef AP_LOG_EXEC -#define AP_LOG_EXEC "/usr/local/apache2/logs/cgi.log" /* Need me? */ +#define AP_LOG_EXEC DEFAULT_EXP_LOGFILEDIR "/suexec_log" /* Need me? */ #endif /* @@ -126,7 +132,7 @@ * that can be used for suEXEC behavior. */ #ifndef AP_DOC_ROOT -#define AP_DOC_ROOT "/usr/local/apache2/htdocs" +#define AP_DOC_ROOT DEFAULT_EXP_HTDOCSDIR #endif /* -- 2.40.0