From: Eric Covener <covener@apache.org>
Date: Tue, 7 Jan 2014 01:56:52 +0000 (+0000)
Subject: Merge r1556102 from trunk:
X-Git-Tag: 2.4.8~257
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=07d46e71ebaa662e0eee92acef366fac8a802eea;p=apache

Merge r1556102 from trunk:

add some information about setenvif vs. subrequests for PR55957




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

diff --git a/docs/manual/env.xml b/docs/manual/env.xml
index 903914edfd..5bb7321254 100644
--- a/docs/manual/env.xml
+++ b/docs/manual/env.xml
@@ -153,6 +153,16 @@
           <directive module="mod_setenvif">SetEnvIf</directive> and <directive
           module="mod_rewrite">RewriteCond</directive> will not see the
           variables set with it.</li>
+ 
+          <li>When the server looks up a path via an internal 
+          <glossary ref="subrequest">subrequest</glossary> such as looking 
+          for a <directive module="mod_dir" >DirectoryIndex</directive> 
+          or generating a directory listing with <module>mod_autoindex</module>,
+          per-request environment variables are <em>not</em> inherited in the 
+          subrequest. Additionally, 
+          <directive module="mod_setenvif">SetEnvIf</directive> directives
+          are not separately evaluated in the subrequest due to the API phases
+           <module>mod_setenvif</module> takes action in.</li>
         </ul>
     </section>
   </section>
diff --git a/docs/manual/glossary.xml b/docs/manual/glossary.xml
index b236d99f43..f8900d5c7e 100644
--- a/docs/manual/glossary.xml
+++ b/docs/manual/glossary.xml
@@ -433,6 +433,14 @@
       Young
     </dd>
 
+    <dt><a name="subrequest" id="subrequest">Subrequest</a></dt>
+    <dd>Apache provides a subrequest API to modules that allows other
+        filesystem or URL paths to be partially or fully evaluated by
+        the server. Example consumers of this API are 
+        <directive module="mod_dir">DirectoryIndex</directive>, 
+        <module>mod_autoindex</module>, and <module>mod_include</module>.
+    </dd>
+
     <dt><a name="symmetriccryptophraphy" id="symmetriccryptophraphy">Symmetric
         Cryptography</a></dt>
     <dd>The study and application of <em>Ciphers</em> that use a single secret key
diff --git a/docs/manual/mod/mod_authz_core.xml b/docs/manual/mod/mod_authz_core.xml
index 8e29ffa395..0a8f97dc46 100644
--- a/docs/manual/mod/mod_authz_core.xml
+++ b/docs/manual/mod/mod_authz_core.xml
@@ -165,6 +165,26 @@ SetEnvIf User-Agent ^KnockKnock/2\.0 let_me_in
     with <code>KnockKnock/2.0</code> will be allowed access, and all
     others will be denied.</p>
 
+    <p>When the server looks up a path via an internal 
+    <glossary ref="subrequest">subrequest</glossary> such as looking 
+    for a <directive module="mod_dir" >DirectoryIndex</directive> 
+    or generating a directory listing with <module>mod_autoindex</module>,
+    per-request environment variables are <em>not</em> inherited in the 
+    subrequest. Additionally, 
+    <directive module="mod_setenvif">SetEnvIf</directive> directives
+    are not separately evaluated in the subrequest due to the API phases
+    <module>mod_setenvif</module>.</p>
+
+
+    <p>When the server looks up a path via an internal subrequest,
+    such as looking for a <directive module="mod_dir"
+    >DirectoryIndex</directive> or generating a directory listing with
+    <module>mod_autoindex</module>, per-request environment variables are
+    <em>not</em> inherited in the subrequest. Additionally, environment
+    <directive module="mod_setenvif">SetEnvIf</directive> directives
+    are not separately evaluated in the subrequest due to the API phases
+    <module>mod_setenvif</module> takes action in.</p>
+
   </section>
 
   <section id="reqall"><title>Require all</title>
diff --git a/docs/manual/mod/mod_setenvif.xml b/docs/manual/mod/mod_setenvif.xml
index 49777c1161..49309a27cc 100644
--- a/docs/manual/mod/mod_setenvif.xml
+++ b/docs/manual/mod/mod_setenvif.xml
@@ -48,6 +48,17 @@ on characteristics of the request</description>
 BrowserMatch ^Mozilla netscape
 BrowserMatch MSIE !netscape
 </highlight>
+
+   <p>When the server looks up a path via an internal 
+   <glossary ref="subrequest">subrequest</glossary> such as looking 
+   for a <directive module="mod_dir" >DirectoryIndex</directive> 
+   or generating a directory listing with <module>mod_autoindex</module>,
+   per-request environment variables are <em>not</em> inherited in the 
+   subrequest. Additionally, 
+   <directive module="mod_setenvif">SetEnvIf</directive> directives
+   are not separately evaluated in the subrequest due to the API phases
+   <module>mod_setenvif</module> takes action in.</p>
+
 </summary>
 
 <seealso><a href="../env.html">Environment Variables in Apache HTTP Server</a></seealso>