You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by je...@apache.org on 2003/01/01 01:14:33 UTC
cvs commit: httpd-2.0/support suexec.h
jerenkrantz 2002/12/31 16:14:33
Modified: . CHANGES
support suexec.h
Log:
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 <th...@planetarytramp.net>
Reviewed by: Justin Erenkrantz
Revision Changes Path
1.1016 +4 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.1015
retrieving revision 1.1016
diff -u -u -r1.1015 -r1.1016
--- CHANGES 19 Dec 2002 05:28:16 -0000 1.1015
+++ CHANGES 1 Jan 2003 00:14:32 -0000 1.1016
@@ -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 <th...@planetarytramp.net>]
+
*) Allow 'make depend' to work with non-GCC compilers.
[Justin Erenkrantz]
1.8 +8 -2 httpd-2.0/support/suexec.h
Index: suexec.h
===================================================================
RCS file: /home/cvs/httpd-2.0/support/suexec.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -u -r1.7 -r1.8
--- suexec.h 27 Sep 2002 23:53:04 -0000 1.7
+++ suexec.h 1 Jan 2003 00:14:33 -0000 1.8
@@ -62,6 +62,12 @@
#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
* this program.
@@ -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
/*