Fix various parsing bugs with <Dir/Loc/Files> sections. Improve the

error messages generated.  Introduced cmd->end_token to make it easier
to do nested sections with proper error reporting.  (Note that it can't
be used for <IfModule> or <Limit> unfortunately.)

PR#379: <Files> is not allowed within <Location> because it has no effect.

PR#1817: Change <Files> to work with basenames only.  This fixes both
the bug introduced by the wildcarding change (* doesn't match /) and
bugs such as <Files a*b> not working.

PR:             379, 1817

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@80233 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/core.html b/docs/manual/mod/core.html
index 65598c929916b6976f0bc0108db7e7c5f0325e7b..f91ba78015f3984084ba54e4a509203fdd255018 100644 (file)
--- a/docs/manual/mod/core.html
+++ b/docs/manual/mod/core.html
@@ -811,12 +811,17 @@ than the user that starts the server.
 filename. It is comparable to the <A
 HREF="#directory">&lt;Directory&gt;</A> directive and
 <A HREF="#location">&lt;Location&gt;</A> directives. It
-should be matched with a &lt;/Files&gt; directive. Directives that
-apply to the filename given should be listed
-within. <CODE>&lt;Files&gt;</CODE> sections are processed in the
+should be matched with a &lt;/Files&gt; directive.  The
+directives given within this section will be applied to any
+object with a basename (last component of filename) matching
+the specified filename.
+<CODE>&lt;Files&gt;</CODE> sections are processed in the
 order they appear in the configuration file, after the
 &lt;Directory&gt; sections and <CODE>.htaccess</CODE> files are
-read, but before &lt;Location&gt; sections.</P>
+read, but before &lt;Location&gt; sections.  Note that
+&lt;Files&gt; can be nested inside &lt;Directory&gt;
+sections to restrict the portion of the filesystem they
+apply to.</P>
 
 <P>The <EM>filename</EM> argument should include a filename, or a
 wild-card string, where `?' matches any single character, and `*' matches any
@@ -837,9 +842,7 @@ HREF="#directory"><CODE>&lt;Directory&gt;</CODE></A> and <A
 HREF="#location"><CODE>&lt;Location&gt;</CODE></A> sections,
 <CODE>&lt;Files&gt;</CODE> sections can be used inside .htaccess
 files. This allows users to control access to their own files, at a
-file-by-file level. When used in an .htaccess file, if the
-<EM>filename</EM> does not begin with a <CODE>/</CODE> character,
-the directory being applied will be prefixed automatically.
+file-by-file level.
 
 <P>