SuExec should use /usr/local/apache2 not /usr/local/apache as the default

directory.

PR:     8789, 13104
Submitted by:   SangBeom han <sbhan@os.korea.ac.kr>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96994 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 219ac5c52ce4b8cb65d083720d1f531e3795b97b..5d0bb2db05ef95084ac08a822d5000d51cfe48c1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0.43
 
+  *) SuExec needs to use the same default directory as the rest of
+     server, namely /usr/local/apache2.  
+     [SangBeom han <sbhan@os.korea.ac.kr>]
+
   *) Get mod_auth_ldap to retry connections on LDAP_SERVER_DOWN.
      [Thomas Bennett <thomas.bennett@eds.com>, Graham Leggett]
 

diff --git a/support/suexec.h b/support/suexec.h
index 34a91f99496eb57198f32a013874422ff3f85336..2342c16822ad54fd7c4e532e7e6854dd84e6585e 100644 (file)
--- a/support/suexec.h
+++ b/support/suexec.h
@@ -117,7 +117,7 @@
  *             debugging purposes.
  */
 #ifndef AP_LOG_EXEC
-#define AP_LOG_EXEC "/usr/local/apache/logs/cgi.log"   /* Need me? */
+#define AP_LOG_EXEC "/usr/local/apache2/logs/cgi.log"  /* Need me? */
 #endif
 
 /*
@@ -126,7 +126,7 @@
  *             that can be used for suEXEC behavior.
  */
 #ifndef AP_DOC_ROOT
-#define AP_DOC_ROOT "/usr/local/apache/htdocs"
+#define AP_DOC_ROOT "/usr/local/apache2/htdocs"
 #endif
 
 /*