You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sl...@apache.org on 2002/09/03 03:13:32 UTC
cvs commit: httpd-2.0/docs/manual sections.xml sections.html.en
slive 2002/09/02 18:13:31
Modified: docs/manual sections.xml sections.html.en
Log:
A little fine-tuning of the new sections doc.
This doc could still use some help from an apache
configuration-merging expert.
Revision Changes Path
1.2 +16 -10 httpd-2.0/docs/manual/sections.xml
Index: sections.xml
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/sections.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- sections.xml 24 Aug 2002 18:26:19 -0000 1.1
+++ sections.xml 3 Sep 2002 01:13:31 -0000 1.2
@@ -32,6 +32,7 @@
<directive type="section" module="core">Location</directive>
<directive type="section" module="core">LocationMatch</directive>
<directive type="section" module="proxy">Proxy</directive>
+<directive type="section" module="proxy">ProxyMatch</directive>
<directive type="section" module="core">VirtualHost</directive>
</directivelist>
</related>
@@ -199,16 +200,20 @@
<p>The <directive type="section" module="core">Directory</directive>,
<directive type="section" module="core">Files</directive>, and
<directive type="section" module="core">Location</directive>
-directives can each use the shell-style wildcard characters "?" to
-match any single character, "*" to match any set of characters, and
-character classes like [a-zA-Z] to match particular characters. This
-is useful to apply the same configuration to a group of filesystem or
-webspace locations. If even more flexible matching is required, each
+directives can each use shell-style wildcard characters as in
+<code>fnmatch</code> from the C standard library. The character "*"
+matches any sequence of characters, "?" matches any single character,
+and "[<em>seq</em>]" matches any character in <em>seq</em>. The "/"
+character will not be matched by any wildcard; it must be specified
+explictly.</p>
+
+<p>If even more flexible matching is required, each
container has a regular-expression (regex) counterpart <directive
type="section" module="core">DirectoryMatch</directive>, <directive
type="section" module="core">FilesMatch</directive>, and <directive
type="section" module="core">LocationMatch</directive> that allow
-perl-compatible<a href="glossary.html#regex">regular expressions</a>
+perl-compatible
+<a href="glossary.html#regex">regular expressions</a>
to be used in choosing the matches. But see the section below on
configuration merging to find out how using regex sections will change
how directives are applied.</p>
@@ -296,8 +301,9 @@
<section id="proxy"><title>Proxy</title>
-<p>The <directive type="section" module="proxy">Proxy</directive>
-container applies enclosed configuration directives only
+<p>The <directive type="section" module="mod_proxy">Proxy</directive>
+and <directive type="section" module="mod_proxy">ProxyMatch</directive>
+containers apply enclosed configuration directives only
to sites accessed through <module>mod_proxy</module>'s proxy server
that match the specified URL. For example, the following configuration
will prevent the proxy server from being used to access the
@@ -324,8 +330,8 @@
<directive type="section" module="core">FilesMatch</directive>,
<directive type="section" module="core">Location</directive>,
<directive type="section" module="core">LocationMatch</directive>,
-and
-<directive type="section" module="proxy">Proxy</directive>
+<directive type="section" module="proxy">Proxy</directive>,
+and <directive type="section" module="proxy">ProxyMatch</directive>
sections. There are some exceptions, however.</p>
<ul>
1.16 +16 -11 httpd-2.0/docs/manual/sections.html.en
Index: sections.html.en
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/sections.html.en,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -b -u -r1.15 -r1.16
--- sections.html.en 24 Aug 2002 18:26:19 -0000 1.15
+++ sections.html.en 3 Sep 2002 01:13:31 -0000 1.16
@@ -9,7 +9,7 @@
to change the scope of other configuration directives.</p>
<ul><li><a href="#types">Types of Configuration Section Containers</a></li><li><a href="#file-and-web">Filesystem and Webspace</a><ul><li><a href="#filesystem">Filesystem Containers</a></li><li><a href="#webspace">Webspace Containers</a></li><li><a href="#wildcards">Wildcards and Regular Expressions</a></li><li><a href="#whichwhen">What to use When</a></li></ul></li><li><a href="#virtualhost">Virtual Hosts</a></li><li><a href="#proxy">Proxy</a></li><li><a href="#whatwhere">What Directives are Allowed?</a></li><li><a href="#mergin">How the sections are merged</a><ul><li><a href="#merge-examples">Some Examples</a></li></ul></li></ul><hr><h2><a name="types">Types of Configuration Section Containers</a></h2>
-<table border="1"><tr><td valign="top"><strong>Related Modules</strong><br><br><code><a href="./mod/core.html">core</a></code><br><code><a href="./mod/mod_proxy.html">mod_proxy</a></code><br></td><td valign="top"><strong>Related Directives</strong><br><br><a href="./mod/core.html#directory" class="directive"><code class="directive"><Directory></code></a><br><a href="./mod/core.html#directorymatch" class="directive"><code class="directive"><DirectoryMatch></code></a><br><a href="./mod/core.html#files" class="directive"><code class="directive"><Files></code></a><br><a href="./mod/core.html#filesmatch" class="directive"><code class="directive"><FilesMatch></code></a><br><a href="./mod/core.html#ifdefine" class="directive"><code class="directive"><IfDefine></code></a><br><a href="./mod/core.html#ifmodule" class="directive"><code class="directive"><IfModule></code></a><br><a href="./mod/core.html#location" class="directive"><code class="directive"><Location></code></a><br><a href="./mod/core.html#locationmatch" class="directive"><code class="directive"><LocationMatch></code></a><br><a href="./mod/proxy.html#proxy" class="directive"><code class="directive"><Proxy></code></a><br><a href="./mod/core.html#virtualhost" class="directive"><code class="directive"><VirtualHost></code></a><br></td></tr></table>
+<table border="1"><tr><td valign="top"><strong>Related Modules</strong><br><br><code><a href="./mod/core.html">core</a></code><br><code><a href="./mod/mod_proxy.html">mod_proxy</a></code><br></td><td valign="top"><strong>Related Directives</strong><br><br><a href="./mod/core.html#directory" class="directive"><code class="directive"><Directory></code></a><br><a href="./mod/core.html#directorymatch" class="directive"><code class="directive"><DirectoryMatch></code></a><br><a href="./mod/core.html#files" class="directive"><code class="directive"><Files></code></a><br><a href="./mod/core.html#filesmatch" class="directive"><code class="directive"><FilesMatch></code></a><br><a href="./mod/core.html#ifdefine" class="directive"><code class="directive"><IfDefine></code></a><br><a href="./mod/core.html#ifmodule" class="directive"><code class="directive"><IfModule></code></a><br><a href="./mod/core.html#location" class="directive"><code class="directive"><Location></code></a><br><a href="./mod/core.html#locationmatch" class="directive"><code class="directive"><LocationMatch></code></a><br><a href="./mod/proxy.html#proxy" class="directive"><code class="directive"><Proxy></code></a><br><a href="./mod/proxy.html#proxymatch" class="directive"><code class="directive"><ProxyMatch></code></a><br><a href="./mod/core.html#virtualhost" class="directive"><code class="directive"><VirtualHost></code></a><br></td></tr></table>
<p>There are two basic types of containers. Most containers are
evaluated for each request. The enclosed directives are applied only
@@ -165,13 +165,17 @@
<p>The <a href="./mod/core.html#directory" class="directive"><code class="directive"><Directory></code></a>,
<a href="./mod/core.html#files" class="directive"><code class="directive"><Files></code></a>, and
<a href="./mod/core.html#location" class="directive"><code class="directive"><Location></code></a>
-directives can each use the shell-style wildcard characters "?" to
-match any single character, "*" to match any set of characters, and
-character classes like [a-zA-Z] to match particular characters. This
-is useful to apply the same configuration to a group of filesystem or
-webspace locations. If even more flexible matching is required, each
+directives can each use shell-style wildcard characters as in
+<code>fnmatch</code> from the C standard library. The character "*"
+matches any sequence of characters, "?" matches any single character,
+and "[<em>seq</em>]" matches any character in <em>seq</em>. The "/"
+character will not be matched by any wildcard; it must be specified
+explictly.</p>
+
+<p>If even more flexible matching is required, each
container has a regular-expression (regex) counterpart <a href="./mod/core.html#directorymatch" class="directive"><code class="directive"><DirectoryMatch></code></a>, <a href="./mod/core.html#filesmatch" class="directive"><code class="directive"><FilesMatch></code></a>, and <a href="./mod/core.html#locationmatch" class="directive"><code class="directive"><LocationMatch></code></a> that allow
-perl-compatible<a href="glossary.html#regex">regular expressions</a>
+perl-compatible
+<a href="glossary.html#regex">regular expressions</a>
to be used in choosing the matches. But see the section below on
configuration merging to find out how using regex sections will change
how directives are applied.</p>
@@ -249,8 +253,9 @@
see the <a href="vhosts/">Virtual Host Documentation</a>.</p>
<h2><a name="proxy">Proxy</a></h2>
-<p>The <a href="./mod/proxy.html#proxy" class="directive"><code class="directive"><Proxy></code></a>
-container applies enclosed configuration directives only
+<p>The <a href="./mod/mod_proxy.html#proxy" class="directive"><code class="directive"><Proxy></code></a>
+and <a href="./mod/mod_proxy.html#proxymatch" class="directive"><code class="directive"><ProxyMatch></code></a>
+containers apply enclosed configuration directives only
to sites accessed through <code><a href="./mod/mod_proxy.html">mod_proxy</a></code>'s proxy server
that match the specified URL. For example, the following configuration
will prevent the proxy server from being used to access the
@@ -274,8 +279,8 @@
<a href="./mod/core.html#filesmatch" class="directive"><code class="directive"><FilesMatch></code></a>,
<a href="./mod/core.html#location" class="directive"><code class="directive"><Location></code></a>,
<a href="./mod/core.html#locationmatch" class="directive"><code class="directive"><LocationMatch></code></a>,
-and
-<a href="./mod/proxy.html#proxy" class="directive"><code class="directive"><Proxy></code></a>
+<a href="./mod/proxy.html#proxy" class="directive"><code class="directive"><Proxy></code></a>,
+and <a href="./mod/proxy.html#proxymatch" class="directive"><code class="directive"><ProxyMatch></code></a>
sections. There are some exceptions, however.</p>
<ul>