From: Vincent Deffontaines <gryzor@apache.org>
Date: Wed, 21 Aug 2013 18:55:47 +0000 (+0000)
Subject: #55441 fix - document that SetEnv cannot set PATH in 2.2
X-Git-Tag: 2.2.26~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24aaa17abe3aa98e56c8340af5b4058bf1834fac;p=thirdparty%2Fapache%2Fhttpd.git

#55441 fix - document that SetEnv cannot set PATH in 2.2


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

diff --git a/docs/manual/mod/mod_env.html.en b/docs/manual/mod/mod_env.html.en
index e4999a143ff..0cde6ca4cce 100644
--- a/docs/manual/mod/mod_env.html.en
+++ b/docs/manual/mod/mod_env.html.en
@@ -39,8 +39,8 @@ SSI pages</td></tr>
     <p>This module allows for control of internal environment variables that
     are used by various Apache HTTP Server modules. These variables are also
     provided to CGI scripts as native system environment variables, and available
-    for use in SSI pages. Environment variables may be passed from the shell 
-    which invoked the <code class="program"><a href="../programs/httpd.html">httpd</a></code> process. Alternatively, 
+    for use in SSI pages. Environment variables may be passed from the shell
+    which invoked the <code class="program"><a href="../programs/httpd.html">httpd</a></code> process. Alternatively,
     environment variables may be set or unset within the configuration process.</p>
 </div>
 <div id="quickview"><h3 class="directives">Directives</h3>
@@ -68,8 +68,8 @@ SSI pages</td></tr>
 </table>
     <p>Specifies one or more native system environment variables to make available
     as internal environment variables, which are available to Apache HTTP Server modules
-    as well as propagated to CGI scripts and SSI pages. Values come from the 
-    native OS environment of the shell which invoked the 
+    as well as propagated to CGI scripts and SSI pages. Values come from the
+    native OS environment of the shell which invoked the
     <code class="program"><a href="../programs/httpd.html">httpd</a></code> process.</p>
 
     <div class="example"><h3>Example</h3><p><code>
@@ -87,13 +87,13 @@ SSI pages</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Base</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_env</td></tr>
 </table>
-    <p>Sets an internal environment variable, which is then available to Apache 
+    <p>Sets an internal environment variable, which is then available to Apache
     HTTP Server modules, and passed on to CGI scripts and SSI pages.</p>
 
     <div class="example"><h3>Example</h3><p><code>
       SetEnv SPECIAL_PATH /foo/bin
     </code></p></div>
- 
+
     <p> If you omit the <var>value</var> argument, the variable is set to
     an empty string.</p>
 
@@ -101,11 +101,13 @@ SSI pages</td></tr>
     <em>after</em> most early request processing directives are run, such as access
     control and URI-to-filename mapping.  If the environment variable you're
     setting is meant as input into this early phase of processing such as the
-    <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> directive, you should 
+    <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> directive, you should
     instead set the environment variable with
     <code class="directive"><a href="../mod/mod_setenvif.html# setenvif"> SetEnvIf</a></code>.</p>
     </div>
-     
+    <div class="note"><p>On 2.2, the PATH environment variable cannot be set using Setenv.</p>
+    </div>
+
 
 <h3>See also</h3>
 <ul>
diff --git a/docs/manual/mod/mod_env.xml b/docs/manual/mod/mod_env.xml
index d918c6abfc6..2abe6783238 100644
--- a/docs/manual/mod/mod_env.xml
+++ b/docs/manual/mod/mod_env.xml
@@ -32,8 +32,8 @@ SSI pages</description>
     <p>This module allows for control of internal environment variables that
     are used by various Apache HTTP Server modules. These variables are also
     provided to CGI scripts as native system environment variables, and available
-    for use in SSI pages. Environment variables may be passed from the shell 
-    which invoked the <program>httpd</program> process. Alternatively, 
+    for use in SSI pages. Environment variables may be passed from the shell
+    which invoked the <program>httpd</program> process. Alternatively,
     environment variables may be set or unset within the configuration process.</p>
 </summary>
 <seealso><a href="../env.html">Environment Variables</a></seealso>
@@ -51,8 +51,8 @@ SSI pages</description>
 <usage>
     <p>Specifies one or more native system environment variables to make available
     as internal environment variables, which are available to Apache HTTP Server modules
-    as well as propagated to CGI scripts and SSI pages. Values come from the 
-    native OS environment of the shell which invoked the 
+    as well as propagated to CGI scripts and SSI pages. Values come from the
+    native OS environment of the shell which invoked the
     <program>httpd</program> process.</p>
 
     <example><title>Example</title>
@@ -70,13 +70,13 @@ SSI pages</description>
 <override>FileInfo</override>
 
 <usage>
-    <p>Sets an internal environment variable, which is then available to Apache 
+    <p>Sets an internal environment variable, which is then available to Apache
     HTTP Server modules, and passed on to CGI scripts and SSI pages.</p>
 
     <example><title>Example</title>
       SetEnv SPECIAL_PATH /foo/bin
     </example>
- 
+
     <p> If you omit the <var>value</var> argument, the variable is set to
     an empty string.</p>
 
@@ -84,11 +84,13 @@ SSI pages</description>
     <em>after</em> most early request processing directives are run, such as access
     control and URI-to-filename mapping.  If the environment variable you're
     setting is meant as input into this early phase of processing such as the
-    <directive module="mod_rewrite">RewriteRule</directive> directive, you should 
+    <directive module="mod_rewrite">RewriteRule</directive> directive, you should
     instead set the environment variable with
     <directive module="mod_setenvif"> SetEnvIf</directive>.</p>
     </note>
-     
+    <note><p>On 2.2, the PATH environment variable cannot be set using Setenv.</p>
+    </note>
+
 </usage>
 <seealso><a href="../env.html">Environment Variables</a></seealso>
 </directivesynopsis>