mirror of
https://github.com/apache/httpd.git
synced 2025-08-16 17:04:42 +00:00
Hit a couple files that hadn't been adapted to account
for the move from <Directory proxy:> to <proxy> git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100748 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joshua Slive
@ -169,12 +169,10 @@
|
||||
<dt>directory</dt>
|
||||
|
||||
<dd>A directive marked as being valid in this context may be
|
||||
used inside <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code>,
|
||||
<code class="directive"><a href="../mod/core.html#location"><Location></a></code>,
|
||||
and <code class="directive"><a href="../mod/core.html#files"><Files></a></code>
|
||||
containers in the server configuration files, subject to the
|
||||
restrictions outlined in <a href="../sections.html">How
|
||||
Directory, Location and Files sections work</a>.</dd>
|
||||
used inside <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code>, <code class="directive"><a href="../mod/core.html#location"><Location></a></code>, <code class="directive"><a href="../mod/core.html#files"><Files></a></code>, and <code class="directive"><a href="../mod/mod_proxy.html#proxy"><Proxy></a></code> containers
|
||||
in the server configuration files, subject to the restrictions
|
||||
outlined in <a href="../sections.html">Configuration
|
||||
Sections</a>.</dd>
|
||||
|
||||
<dt>.htaccess</dt>
|
||||
|
||||
|
||||
@ -147,12 +147,13 @@
|
||||
|
||||
<dd>A directive marked as being valid in this context may be
|
||||
used inside <directive module="core"
|
||||
type="section">Directory</directive>,
|
||||
<directive type="section" module="core">Location</directive>,
|
||||
and <directive module="core" type="section">Files</directive>
|
||||
containers in the server configuration files, subject to the
|
||||
restrictions outlined in <a href="../sections.html">How
|
||||
Directory, Location and Files sections work</a>.</dd>
|
||||
type="section">Directory</directive>, <directive type="section"
|
||||
module="core">Location</directive>, <directive module="core"
|
||||
type="section">Files</directive>, and <directive
|
||||
module="mod_proxy" type="section">Proxy</directive> containers
|
||||
in the server configuration files, subject to the restrictions
|
||||
outlined in <a href="../sections.html">Configuration
|
||||
Sections</a>.</dd>
|
||||
|
||||
<dt>.htaccess</dt>
|
||||
|
||||
|
||||
@ -50,27 +50,13 @@ is available only in Apache 2.0</td></tr></table>
|
||||
<div class="section">
|
||||
<h2><a name="order" id="order">Order of Processing</a></h2>
|
||||
|
||||
<p>The directives provided by <code class="module"><a href="../mod/mod_headers.html">mod_headers</a></code> can occur
|
||||
almost anywhere within the server configuration. They are valid in the
|
||||
main server config and virtual host sections, inside
|
||||
<code class="directive"><a href="../mod/core.html#directory"><Directory></a></code>,
|
||||
<code class="directive"><a href="../mod/core.html#location"><Location></a></code> and
|
||||
<code class="directive"><a href="../mod/core.html#files"><Files></a></code> sections,
|
||||
and within <code>.htaccess</code> files.</p>
|
||||
<p>The directives provided by <code class="module"><a href="../mod/mod_headers.html">mod_headers</a></code> can
|
||||
occur almost anywhere within the server configuration, and can be
|
||||
limited in scope by enclosing them in <a href="../sections.html">configuration sections</a>.</p>
|
||||
|
||||
<p>The directives are processed in the following order:</p>
|
||||
|
||||
<ol>
|
||||
<li>main server</li>
|
||||
<li>virtual host</li>
|
||||
<li><code class="directive"><Directory></code> sections and
|
||||
<code>.htaccess</code></li>
|
||||
<li><code class="directive"><Files></code></li>
|
||||
<li><code class="directive"><Location></code></li>
|
||||
</ol>
|
||||
|
||||
<p>Order is important. These two headers have a different
|
||||
effect if reversed:</p>
|
||||
<p>Order of processing is important and is affected both by the
|
||||
order in the configuration file and by placement in <a href="../sections.html#mergin">configuration sections</a>. These
|
||||
two headers have a different effect if reversed:</p>
|
||||
|
||||
<div class="example"><p><code>
|
||||
RequestHeader append MirrorID "mirror 12"<br />
|
||||
|
||||
@ -20,27 +20,15 @@ is available only in Apache 2.0</compatibility>
|
||||
|
||||
<section id="order"><title>Order of Processing</title>
|
||||
|
||||
<p>The directives provided by <module>mod_headers</module> can occur
|
||||
almost anywhere within the server configuration. They are valid in the
|
||||
main server config and virtual host sections, inside
|
||||
<directive module="core" type="section">Directory</directive>,
|
||||
<directive module="core" type="section">Location</directive> and
|
||||
<directive module="core" type="section">Files</directive> sections,
|
||||
and within <code>.htaccess</code> files.</p>
|
||||
<p>The directives provided by <module>mod_headers</module> can
|
||||
occur almost anywhere within the server configuration, and can be
|
||||
limited in scope by enclosing them in <a
|
||||
href="../sections.html">configuration sections</a>.</p>
|
||||
|
||||
<p>The directives are processed in the following order:</p>
|
||||
|
||||
<ol>
|
||||
<li>main server</li>
|
||||
<li>virtual host</li>
|
||||
<li><directive type="section">Directory</directive> sections and
|
||||
<code>.htaccess</code></li>
|
||||
<li><directive type="section">Files</directive></li>
|
||||
<li><directive type="section">Location</directive></li>
|
||||
</ol>
|
||||
|
||||
<p>Order is important. These two headers have a different
|
||||
effect if reversed:</p>
|
||||
<p>Order of processing is important and is affected both by the
|
||||
order in the configuration file and by placement in <a
|
||||
href="../sections.html#mergin">configuration sections</a>. These
|
||||
two headers have a different effect if reversed:</p>
|
||||
|
||||
<example>
|
||||
RequestHeader append MirrorID "mirror 12"<br />
|
||||
|
||||
@ -376,6 +376,11 @@ are interpreted, it is important to understand how this works.</p>
|
||||
the virtual host definition. This allows virtual hosts to
|
||||
override the main server configuration.</p>
|
||||
|
||||
<p>When the request is served by <code class="module"><a href="./mod/mod_proxy.html">mod_proxy</a></code>, the
|
||||
<code class="directive"><a href="./mod/mod_proxy.html#proxy"><Proxy></a></code>
|
||||
container takes the place of the <code class="directive"><a href="./mod/core.html#directory"><Directory></a></code> container in the processing
|
||||
order.</p>
|
||||
|
||||
<p>Later sections override earlier ones.</p>
|
||||
|
||||
<div class="note"><h3>Technical Note</h3>
|
||||
|
||||
@ -400,6 +400,12 @@ are interpreted, it is important to understand how this works.</p>
|
||||
the virtual host definition. This allows virtual hosts to
|
||||
override the main server configuration.</p>
|
||||
|
||||
<p>When the request is served by <module>mod_proxy</module>, the
|
||||
<directive module="mod_proxy" type="section">Proxy</directive>
|
||||
container takes the place of the <directive module="core"
|
||||
type="section">Directory</directive> container in the processing
|
||||
order.</p>
|
||||
|
||||
<p>Later sections override earlier ones.</p>
|
||||
|
||||
<note><title>Technical Note</title>
|
||||
|
||||
Reference in New Issue
Block a user