nd 2003/01/27 19:05:39
Modified: . Tag: APACHE_2_0_BRANCH CHANGES STATUS
support Tag: APACHE_2_0_BRANCH suexec.h
Log:
backport from 2.1:
Use saner default config values for suexec.
PR: 15713
Submitted by: Thom May <thom@planetarytramp.net>
Revision Changes Path
No revision
No revision
1.988.2.26 +3 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.988.2.25
retrieving revision 1.988.2.26
diff -u -r1.988.2.25 -r1.988.2.26
--- CHANGES 25 Jan 2003 00:01:09 -0000 1.988.2.25
+++ CHANGES 28 Jan 2003 03:05:37 -0000 1.988.2.26
@@ -1,5 +1,8 @@
Changes with Apache 2.0.45
+ *) Use saner default config values for suexec. PR 15713.
+ [Thom May <thom@planetarytramp.net>]
+
*) mod_rewrite: Allow "RewriteEngine Off" even if no "Options FollowSymlinks"
(or SymlinksIfOwnermatch) is set. PR 12395. [André Malo]
1.751.2.66 +1 -5 httpd-2.0/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/httpd-2.0/STATUS,v
retrieving revision 1.751.2.65
retrieving revision 1.751.2.66
diff -u -r1.751.2.65 -r1.751.2.66
--- STATUS 25 Jan 2003 00:01:09 -0000 1.751.2.65
+++ STATUS 28 Jan 2003 03:05:38 -0000 1.751.2.66
@@ -69,10 +69,6 @@
* mod_file_cache segfault bugfix. PR 16313.
+1: stoddard, orlikowski, striker
- * Use saner default config values for suexec. PR 15713.
- support/suexec.h r1.8
- +1: nd, jerenkrantz, trawick
-
* Rewrite how proxy sends its request to allow input bodies to
morph the request bodies. Previously, if an input filter
changed the request body, the original C-L would be sent which
No revision
No revision
1.7.2.1 +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.7.2.1
diff -u -r1.7 -r1.7.2.1
--- suexec.h 27 Sep 2002 23:53:04 -0000 1.7
+++ suexec.h 28 Jan 2003 03:05:39 -0000 1.7.2.1
@@ -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
/*
|