Imported Upstream version 2.4.9upstream/2.4.9

1 files changed, 25 insertions, 25 deletions

diff --git a/docs/manual/env.html.en b/docs/manual/env.html.en
index 6d942d90..e65978f9 100644
--- a/docs/manual/env.html.en
+++ b/docs/manual/env.html.en
@@ -9,7 +9,7 @@
 <link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
 <link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
 <link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link rel="stylesheet" type="text/css" href="./style/css/prettify.css" />
-<script src="./style/scripts/prettify.js" type="text/javascript">
+<script src="./style/scripts/prettify.min.js" type="text/javascript">
 </script>
 
 <link href="./images/favicon.ico" rel="shortcut icon" /></head>
@@ -141,6 +141,16 @@
           late during request processing meaning that directives such as
           <code class="directive"><a href="./mod/mod_setenvif.html#setenvif">SetEnvIf</a></code> and <code class="directive"><a href="./mod/mod_rewrite.html#rewritecond">RewriteCond</a></code> will not see the
           variables set with it.</li>
+ 
+          <li>When the server looks up a path via an internal 
+          <a class="glossarylink" href="./glossary.html#subrequest" title="see glossary">subrequest</a> such as looking 
+          for a <code class="directive"><a href="./mod/mod_dir.html#directoryindex">DirectoryIndex</a></code> 
+          or generating a directory listing with <code class="module"><a href="./mod/mod_autoindex.html">mod_autoindex</a></code>,
+          per-request environment variables are <em>not</em> inherited in the 
+          subrequest. Additionally, 
+          <code class="directive"><a href="./mod/mod_setenvif.html#setenvif">SetEnvIf</a></code> directives
+          are not separately evaluated in the subrequest due to the API phases
+           <code class="module"><a href="./mod/mod_setenvif.html">mod_setenvif</a></code> takes action in.</li>
         </ul>
     
   </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
@@ -148,7 +158,7 @@
 <h2><a name="using" id="using">Using Environment Variables</a></h2>
     
 
-    <table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_authz_host.html">mod_authz_host</a></code></li><li><code class="module"><a href="./mod/mod_cgi.html">mod_cgi</a></code></li><li><code class="module"><a href="./mod/mod_ext_filter.html">mod_ext_filter</a></code></li><li><code class="module"><a href="./mod/mod_headers.html">mod_headers</a></code></li><li><code class="module"><a href="./mod/mod_include.html">mod_include</a></code></li><li><code class="module"><a href="./mod/mod_log_config.html">mod_log_config</a></code></li><li><code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_access_compat.html#allow">Allow</a></code></li><li><code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code></li><li><code class="directive"><a href="./mod/mod_access_compat.html#deny">Deny</a></code></li><li><code class="directive"><a href="./mod/mod_ext_filter.html#extfilterdefine">ExtFilterDefine</a></code></li><li><code class="directive"><a href="./mod/mod_headers.html#header">Header</a></code></li><li><code class="directive"><a href="./mod/mod_log_config.html#logformat">LogFormat</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewritecond">RewriteCond</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewriterule">RewriteRule</a></code></li></ul></td></tr></table>
+    <table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_authz_host.html">mod_authz_host</a></code></li><li><code class="module"><a href="./mod/mod_cgi.html">mod_cgi</a></code></li><li><code class="module"><a href="./mod/mod_ext_filter.html">mod_ext_filter</a></code></li><li><code class="module"><a href="./mod/mod_headers.html">mod_headers</a></code></li><li><code class="module"><a href="./mod/mod_include.html">mod_include</a></code></li><li><code class="module"><a href="./mod/mod_log_config.html">mod_log_config</a></code></li><li><code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_authz_core.html#require">Require</a></code></li><li><code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code></li><li><code class="directive"><a href="./mod/mod_access_compat.html#deny">Deny</a></code></li><li><code class="directive"><a href="./mod/mod_ext_filter.html#extfilterdefine">ExtFilterDefine</a></code></li><li><code class="directive"><a href="./mod/mod_headers.html#header">Header</a></code></li><li><code class="directive"><a href="./mod/mod_log_config.html#logformat">LogFormat</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewritecond">RewriteCond</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewriterule">RewriteRule</a></code></li></ul></td></tr></table>
 
     <h3><a name="cgi-scripts" id="cgi-scripts">CGI Scripts</a></h3>
         
@@ -396,7 +406,7 @@
       
 
       <p>Starting with version 2.4, Apache is more strict about how HTTP
-      headers are converted to environment variables in <code class="module"><a href="./mod/mod_cgi&#10;      .html">mod_cgi
+      headers are converted to environment variables in <code class="module"><a href="./mod/mod_cgi.html">mod_cgi
       </a></code> and other modules:  Previously any invalid characters
       in header names were simply translated to underscores.  This allowed
       for some potential cross-site-scripting attacks via header injection
@@ -404,18 +414,16 @@
       Unusual Web Bugs</a>, slide 19/20).</p>
 
       <p>If you have to support a client which sends broken headers and
-      which can't be fixed, a simple workaround involving <code class="module"><a href="./mod/mod_setenvif&#10;      .html">mod_setenvif
-      </a></code> and <code class="module"><a href="./mod/mod_header.html">mod_header</a></code> allows you to still accept
+      which can't be fixed, a simple workaround involving <code class="module"><a href="./mod/mod_setenvif.html">mod_setenvif
+      </a></code> and <code class="module"><a href="./mod/mod_headers.html">mod_headers</a></code> allows you to still accept
       these headers:</p>
 
-<pre class="prettyprint lang-config">
-# 
+<pre class="prettyprint lang-config"># 
 # The following works around a client sending a broken Accept_Encoding
 # header.
 #
 SetEnvIfNoCase ^Accept.Encoding$ ^(.*)$ fix_accept_encoding=$1
-RequestHeader set Accept-Encoding %{fix_accept_encoding}e env=fix_accept_encoding
-</pre>
+RequestHeader set Accept-Encoding %{fix_accept_encoding}e env=fix_accept_encoding</pre>
 
 
     
@@ -427,8 +435,7 @@ RequestHeader set Accept-Encoding %{fix_accept_encoding}e env=fix_accept_encodin
         httpd.conf to deal with known client problems.  Since the affected clients
         are no longer seen in the wild, this configuration is likely no-longer
         necessary.</p>
-<pre class="prettyprint lang-config">
-#
+<pre class="prettyprint lang-config">#
 # The following directives modify normal HTTP response behavior.
 # The first directive disables keepalive for Netscape 2.x and browsers that
 # spoof it. There are known problems with these browser implementations.
@@ -446,8 +453,7 @@ BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0
 #
 BrowserMatch "RealPlayer 4\.0" force-response-1.0
 BrowserMatch "Java/1\.0" force-response-1.0
-BrowserMatch "JDK/1\.0" force-response-1.0
-</pre>
+BrowserMatch "JDK/1\.0" force-response-1.0</pre>
 
 
     
@@ -459,12 +465,10 @@ BrowserMatch "JDK/1\.0" force-response-1.0
         particular directories, or to prevent logging of requests
         coming from particular hosts.</p>
 
-        <pre class="prettyprint lang-config">
-SetEnvIf Request_URI \.gif image-request
+        <pre class="prettyprint lang-config">SetEnvIf Request_URI \.gif image-request
 SetEnvIf Request_URI \.jpg image-request
 SetEnvIf Request_URI \.png image-request
-CustomLog logs/access_log common env=!image-request
-        </pre>
+CustomLog logs/access_log common env=!image-request</pre>
 
 
     
@@ -477,16 +481,12 @@ CustomLog logs/access_log common env=!image-request
         in limited circumstances. We assume that all your images are in
         a directory called <code>/web/images</code>.</p>
 
-        <pre class="prettyprint lang-config">
-SetEnvIf Referer "^http://www\.example\.com/" local_referal
+        <pre class="prettyprint lang-config">SetEnvIf Referer "^http://www\.example\.com/" local_referal
 # Allow browsers that do not send Referer info
 SetEnvIf Referer "^$" local_referal
 &lt;Directory /web/images&gt;
-    Order Deny,Allow
-    Deny from all
-    Allow from env=local_referal
-&lt;/Directory&gt;
-        </pre>
+    Require env local_referal
+&lt;/Directory&gt;</pre>
 
 
         <p>For more information about this technique, see the
@@ -518,7 +518,7 @@ var comments_identifier = 'http://httpd.apache.org/docs/2.4/env.html';
     }
 })(window, document);
 //--><!]]></script></div><div id="footer">
-<p class="apache">Copyright 2013 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="apache">Copyright 2014 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="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div><script type="text/javascript"><!--//--><![CDATA[//><!--
 if (typeof(prettyPrint) !== 'undefined') {
     prettyPrint();