Commit 4704f9a1 authored by Richard Bowen's avatar Richard Bowen
Browse files

Clarifies FilesMatch and LocationMatch examples, as per bz53483 


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

docs/manual/mod/core.html.en

+14 −1
Changes for docs/manual/mod/core.html.en: 14 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -1744,13 +1744,17 @@ filenames</td></tr> 
    does. However, it accepts a <a class="glossarylink" href="../glossary.html#regex" title="see glossary">regular

    expression</a>. For example:</p>



<pre class="prettyprint lang-config">&lt;FilesMatch "\.(gif|jpe?g|png)$"&gt;

<pre class="prettyprint lang-config">&lt;FilesMatch ".+\.(gif|jpe?g|png)$"&gt;

    # ...

&lt;/FilesMatch&gt;</pre>





    <p>would match most common Internet graphics formats.</p>



    <div class="note">The <code>.+</code> at the start of the regex ensures that

    files named <code>.png</code>, or <code>.gif</code>, for example,

    are not matched.</div>



    <p>From 2.4.8 onwards, named groups and backreferences are captured and

    written to the environment with the corresponding name prefixed with

    "MATCH_" and in upper case. This allows elements of files to be referenced
@@ -2698,6 +2702,15 @@ matching URLs</td></tr> 
    <p>would match URLs that contained the substring <code>/extra/data</code>

    or <code>/special/data</code>.</p>



    <div class="note"><p>If the intent is that a URL <strong>starts with</strong>

    <code>/extra/data</code>, rather than merely

    <strong>contains</strong> <code>/extra/data</code>, prefix the

    regular expression with a <code>^</code> to require this.</p>



    <pre class="prettyprint lang-config">&lt;LocationMatch "^/(extra|special)/data"&gt;</pre>



    </div>



    <p>From 2.4.8 onwards, named groups and backreferences are captured and

    written to the environment with the corresponding name prefixed with

    "MATCH_" and in upper case. This allows elements of URLs to be referenced

docs/manual/mod/core.xml

+15 −1
Changes for docs/manual/mod/core.xml: 15 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -1738,13 +1738,17 @@ filenames</description> 
    expression</glossary>. For example:</p>



<highlight language="config">

&lt;FilesMatch "\.(gif|jpe?g|png)$"&gt;

&lt;FilesMatch ".+\.(gif|jpe?g|png)$"&gt;

    # ...

&lt;/FilesMatch&gt;

</highlight>



    <p>would match most common Internet graphics formats.</p>



    <note>The <code>.+</code> at the start of the regex ensures that

    files named <code>.png</code>, or <code>.gif</code>, for example,

    are not matched.</note>



    <p>From 2.4.8 onwards, named groups and backreferences are captured and

    written to the environment with the corresponding name prefixed with

    "MATCH_" and in upper case. This allows elements of files to be referenced
@@ -2711,6 +2715,16 @@ matching URLs</description> 
    <p>would match URLs that contained the substring <code>/extra/data</code>

    or <code>/special/data</code>.</p>



    <note><p>If the intent is that a URL <strong>starts with</strong>

    <code>/extra/data</code>, rather than merely

    <strong>contains</strong> <code>/extra/data</code>, prefix the

    regular expression with a <code>^</code> to require this.</p>



    <highlight language="config">

    &lt;LocationMatch "^/(extra|special)/data"&gt;

    </highlight>

    </note>



    <p>From 2.4.8 onwards, named groups and backreferences are captured and

    written to the environment with the corresponding name prefixed with

    "MATCH_" and in upper case. This allows elements of URLs to be referenced