Backport:

  Mention that mod_userdir is required for suexec to work
  in user directories.

  PR: 25477

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

diff --git a/docs/manual/suexec.html.en b/docs/manual/suexec.html.en
index e995a5f898cd93bbfb0148ccd0a6b224747dc660..2cfeff428e250975a5968f22e898106e3310bb4e 100644 (file)
--- a/docs/manual/suexec.html.en
+++ b/docs/manual/suexec.html.en
@@ -528,6 +528,10 @@
 <div class="section">
 <h2><a name="usage" id="usage">Using suEXEC</a></h2>
 
+    <p>Requests for CGI programs will call the suEXEC wrapper only if
+    they are for a virtual host containing a <code class="directive"><a href="./mod/mod_suexec.html#suexecusergroup">SuexecUserGroup</a></code> directive or if
+    they are processed by <code class="module"><a href="./mod/mod_userdir.html">mod_userdir</a></code>.</p>
+
     <p><strong>Virtual Hosts:</strong><br /> One way to use the suEXEC
     wrapper is through the <code class="directive"><a href="./mod/mod_suexec.html#suexecusergroup">SuexecUserGroup</a></code> directive in
     <code class="directive"><a href="./mod/core.html#virtualhost">VirtualHost</a></code> definitions.  By
@@ -537,16 +541,15 @@
     directive is not specified for a <code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> then the main server userid
     is assumed.</p>
 
-    <p><strong>User directories:</strong><br />
-     The suEXEC wrapper can also be used to execute CGI programs as
-    the user to which the request is being directed. This is
-    accomplished by using the "<strong><code>~</code></strong>"
-    character prefixing the user ID for whom execution is desired.
-    The only requirement needed for this feature to work is for CGI
-    execution to be enabled for the user and that the script must
-    meet the scrutiny of the <a href="#model">security checks</a>
-    above.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+    <p><strong>User directories:</strong><br /> Requests that are
+     processed by <code class="module"><a href="./mod/mod_userdir.html">mod_userdir</a></code> will call the suEXEC
+     wrapper to execute CGI programs under the userid of the requested
+     user directory.  The only requirement needed for this feature to
+     work is for CGI execution to be enabled for the user and that the
+     script must meet the scrutiny of the <a href="#model">security
+     checks</a> above.  See also the
+     <code>--with-suexec-userdir</code> <a href="#install">compile
+     time option</a>.</p> </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="debug" id="debug">Debugging suEXEC</a></h2>
 
@@ -619,4 +622,4 @@
 </div><div id="footer">
 <p class="apache">Copyright 1999-2004 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
-</body></html>
\ No newline at end of file
+</body></html>

diff --git a/docs/manual/suexec.xml b/docs/manual/suexec.xml
index 721b5b480a02143f8f46418bf6575fef29a5e87f..16fb4f779be92e880e0068bdcb35e1fc81d99764 100644 (file)
--- a/docs/manual/suexec.xml
+++ b/docs/manual/suexec.xml
@@ -517,6 +517,11 @@
 
 <section id="usage"><title>Using suEXEC</title>
 
+    <p>Requests for CGI programs will call the suEXEC wrapper only if
+    they are for a virtual host containing a <directive
+    module="mod_suexec">SuexecUserGroup</directive> directive or if
+    they are processed by <module>mod_userdir</module>.</p>
+
     <p><strong>Virtual Hosts:</strong><br /> One way to use the suEXEC
     wrapper is through the <directive
     module="mod_suexec">SuexecUserGroup</directive> directive in
@@ -529,16 +534,15 @@
     type="section">VirtualHost</directive> then the main server userid
     is assumed.</p>
 
-    <p><strong>User directories:</strong><br />
-     The suEXEC wrapper can also be used to execute CGI programs as
-    the user to which the request is being directed. This is
-    accomplished by using the "<strong><code>~</code></strong>"
-    character prefixing the user ID for whom execution is desired.
-    The only requirement needed for this feature to work is for CGI
-    execution to be enabled for the user and that the script must
-    meet the scrutiny of the <a href="#model">security checks</a>
-    above.</p>
-</section>
+    <p><strong>User directories:</strong><br /> Requests that are
+     processed by <module>mod_userdir</module> will call the suEXEC
+     wrapper to execute CGI programs under the userid of the requested
+     user directory.  The only requirement needed for this feature to
+     work is for CGI execution to be enabled for the user and that the
+     script must meet the scrutiny of the <a href="#model">security
+     checks</a> above.  See also the
+     <code>--with-suexec-userdir</code> <a href="#install">compile
+     time option</a>.</p> </section>
 
 <section id="debug"><title>Debugging suEXEC</title>