VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-16 17:04:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hit a couple files that hadn't been adapted to account

Browse Source 
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
2003-07-23 19:36:36 +00:00
parent 2f283a1dcd
commit 20deaccf3e
6 changed files with 36 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docs/manual/mod/directive-dict.html.en
View File

@ -169,12 +169,10 @@
<dt>directory</dt> <dt>directory</dt>
<dd>A directive marked as being valid in this context may be <dd>A directive marked as being valid in this context may be
used inside <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>, used inside <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>, <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>, <code class="directive"><a href="../mod/core.html#files">&lt;Files&gt;</a></code>, and <code class="directive"><a href="../mod/mod_proxy.html#proxy">&lt;Proxy&gt;</a></code> containers
<code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>, in the server configuration files, subject to the restrictions
and <code class="directive"><a href="../mod/core.html#files">&lt;Files&gt;</a></code> outlined in <a href="../sections.html">Configuration
containers in the server configuration files, subject to the Sections</a>.</dd>
restrictions outlined in <a href="../sections.html">How
Directory, Location and Files sections work</a>.</dd>
<dt>.htaccess</dt> <dt>.htaccess</dt>

13
docs/manual/mod/directive-dict.xml
View File

@ -147,12 +147,13 @@
<dd>A directive marked as being valid in this context may be <dd>A directive marked as being valid in this context may be
used inside <directive module="core" used inside <directive module="core"
type="section">Directory</directive>, type="section">Directory</directive>, <directive type="section"
<directive type="section" module="core">Location</directive>, module="core">Location</directive>, <directive module="core"
and <directive module="core" type="section">Files</directive> type="section">Files</directive>, and <directive
containers in the server configuration files, subject to the module="mod_proxy" type="section">Proxy</directive> containers
restrictions outlined in <a href="../sections.html">How in the server configuration files, subject to the restrictions
Directory, Location and Files sections work</a>.</dd> outlined in <a href="../sections.html">Configuration
Sections</a>.</dd>
<dt>.htaccess</dt> <dt>.htaccess</dt>

26
docs/manual/mod/mod_headers.html.en
View File

@ -50,27 +50,13 @@ is available only in Apache 2.0</td></tr></table>
<div class="section"> <div class="section">
<h2><a name="order" id="order">Order of Processing</a></h2> <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 <p>The directives provided by <code class="module"><a href="../mod/mod_headers.html">mod_headers</a></code> can
almost anywhere within the server configuration. They are valid in the occur almost anywhere within the server configuration, and can be
main server config and virtual host sections, inside limited in scope by enclosing them in <a href="../sections.html">configuration sections</a>.</p>
<code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>,
<code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> and
<code class="directive"><a href="../mod/core.html#files">&lt;Files&gt;</a></code> sections,
and within <code>.htaccess</code> files.</p>
<p>The directives are processed in the following order:</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
<ol> two headers have a different effect if reversed:</p>
<li>main server</li>
<li>virtual host</li>
<li><code class="directive">&lt;Directory&gt;</code> sections and
<code>.htaccess</code></li>
<li><code class="directive">&lt;Files&gt;</code></li>
<li><code class="directive">&lt;Location&gt;</code></li>
</ol>
<p>Order is important. These two headers have a different
effect if reversed:</p>
<div class="example"><p><code> <div class="example"><p><code>
RequestHeader append MirrorID "mirror 12"<br /> RequestHeader append MirrorID "mirror 12"<br />

28
docs/manual/mod/mod_headers.xml
View File

@ -20,27 +20,15 @@ is available only in Apache 2.0</compatibility>
<section id="order"><title>Order of Processing</title> <section id="order"><title>Order of Processing</title>
<p>The directives provided by <module>mod_headers</module> can occur <p>The directives provided by <module>mod_headers</module> can
almost anywhere within the server configuration. They are valid in the occur almost anywhere within the server configuration, and can be
main server config and virtual host sections, inside limited in scope by enclosing them in <a
<directive module="core" type="section">Directory</directive>, href="../sections.html">configuration sections</a>.</p>
<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 are processed in the following order:</p> <p>Order of processing is important and is affected both by the
order in the configuration file and by placement in <a
<ol> href="../sections.html#mergin">configuration sections</a>. These
<li>main server</li> two headers have a different effect if reversed:</p>
<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>
<example> <example>
RequestHeader append MirrorID "mirror 12"<br /> RequestHeader append MirrorID "mirror 12"<br />

5
docs/manual/sections.html.en
View File

@ -376,6 +376,11 @@ are interpreted, it is important to understand how this works.</p>
the virtual host definition. This allows virtual hosts to the virtual host definition. This allows virtual hosts to
override the main server configuration.</p> 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">&lt;Proxy&gt;</a></code>
container takes the place of the <code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> container in the processing
order.</p>
<p>Later sections override earlier ones.</p> <p>Later sections override earlier ones.</p>
<div class="note"><h3>Technical Note</h3> <div class="note"><h3>Technical Note</h3>

6
docs/manual/sections.xml
View File

@ -400,6 +400,12 @@ are interpreted, it is important to understand how this works.</p>
the virtual host definition. This allows virtual hosts to the virtual host definition. This allows virtual hosts to
override the main server configuration.</p> 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> <p>Later sections override earlier ones.</p>
<note><title>Technical Note</title> <note><title>Technical Note</title>