akosut 96/11/28 00:08:20
Modified: htdocs/manual new_features_1_2.html
htdocs/manual/mod core.html
Log:
Update Directory/Location/Files docs.
Revision Changes Path
1.7 +7 -5 apache/htdocs/manual/new_features_1_2.html
Index: new_features_1_2.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/new_features_1_2.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -C3 -r1.6 -r1.7
*** new_features_1_2.html 1996/11/28 07:42:15 1.6
--- new_features_1_2.html 1996/11/28 08:08:17 1.7
***************
*** 46,58 ****
number of powerful new features, such as the ability to set variables
and use conditional HTML.
! <li><b><a href="files.html">File-based and Regex-enabled Directive
! Sections</a></b><br>
! The new <code><Files></code> section allows directives to be
! enabled based on full filename, not just directory and URL. In
addition, <code><Files></code> sections can appear in
<code>.htaccess</code> files. <code><Files></code>, along with
! <code><Directory></code> and <code><Location></code>, can
also now be based on regular expressions, not just simple prefix
matching.
--- 46,60 ----
number of powerful new features, such as the ability to set variables
and use conditional HTML.
! <li><b><a href="mod/core.html#files">File-based and Regex-enabled
! Directive Sections</a></b><br>
! The new
! <a href="mod/core.html#files"><code><Files></code></a>
! section allows directives to be enabled based on full filename, not just
directory and URL. In
addition, <code><Files></code> sections can appear in
<code>.htaccess</code> files. <code><Files></code>, along with
! <a href="mod/core.html#directory"><code><Directory></code></a>
! and <a href="mod/core.html#location"><code><Location></code></a>, can
also now be based on regular expressions, not just simple prefix
matching.
1.7 +71 -17 apache/htdocs/manual/mod/core.html
Index: core.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/mod/core.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -C3 -r1.6 -r1.7
*** core.html 1996/11/28 07:42:16 1.6
--- core.html 1996/11/28 08:08:19 1.7
***************
*** 77,88 ****
<p><hr>
<A name="files"><h2><Files></h2></A>
! <strong>Syntax:</strong> <Files <em>regexp</em>><BR>
! <strong>Context:</strong> server config, virtualhost, directory<br>
! <strong>Status:</strong> Core. <p>
! The File container applies the directives within to files
! which match the regexp.
<p> <hr>
--- 77,119 ----
<p><hr>
<A name="files"><h2><Files></h2></A>
! <strong>Syntax:</strong> <Files <em>filename</em>>
! ... </Files><br>
! <strong>Context:</strong> server config, virtual host, htaccess<br>
! <strong>Status:</strong> core<br>
! <strong>Compatibility:</strong> only available in Apache
! 1.2 and above.<p>
!
! <p>The <Files> directive provides for access control by
! filename. It is comparable to the <a
! href="#directory"><Directory></a> directive and
! <a href="#location"><Location></a> directives. It
! should be matched with a </Files> directive. Directives that
! apply to the filename given should be listed
! within. <code><Files></code> sections are processed in the
! order they appear in the configuration file, after the
! <Directory> sections and <code>.htaccess</code> files are
! read, but before <Location> sections.</p>
! <p>The <em>filename</em> argument should include a filename, or a
! wildcard string, where `?' matches any single character, and `*' matches any
! sequences of characters. Extended regular expressions can also be used,
with the addition of
! the <code>~</code> character. For example:</p>
!
! <pre>
! <Files ~ "\.(gif|jpe?g|png)$">
! </pre>
!
! would match most common Internet graphics formats.
!
! <p>Note that unlike <a
! href="#directory"><code><Directory></code></a> and <a
! href="#location"><code><Location></code></a> sections,
! <code><Files></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.
<p> <hr>
***************
*** 303,310 ****
<A name="directory"><h2><Directory> directive</h2></A>
<!--%plaintext <?INDEX {\tt Directory} section directive> -->
! <strong>Syntax:</strong> <Directory <em>directory</em>> ...
! </Directory> <br>
<strong>Context:</strong> server config, virtual host<br>
<strong>Status:</strong> Core. <p>
--- 334,340 ----
<A name="directory"><h2><Directory> directive</h2></A>
<!--%plaintext <?INDEX {\tt Directory} section directive> -->
! <strong>Syntax:</strong> <Directory <em>directory</em>> ...
</Directory> <br>
<strong>Context:</strong> server config, virtual host<br>
<strong>Status:</strong> Core. <p>
***************
*** 314,325 ****
context may be used. <em>Directory</em> is either the full path to a
directory,
or a wildcard string. In a wildcard string, `?' matches any single
character,
and `*' matches any sequences of characters. Example:
! <blockquote>
! <code>
! <Directory /usr/local/httpd/htdocs><br>
! Options Indexes FollowSymLinks<br>
! </Directory></code></blockquote>
! If multiple directory sections match the directory (or its parents)
containing
a document, then the directives are applied in the order of shortest match
first, interspersed with the directives from the
<A HREF="#accessfilename">.htaccess</A> files. For example, with
--- 344,366 ----
context may be used. <em>Directory</em> is either the full path to a
directory,
or a wildcard string. In a wildcard string, `?' matches any single
character,
and `*' matches any sequences of characters. Example:
! <pre>
! <Directory /usr/local/httpd/htdocs>
! Options Indexes FollowSymLinks
! </Directory>
! </pre>
!
! <p><strong>Apache 1.2 and above:</strong>
! Extended regular expressions can also be used, with the addition of the
! <code>~</code> character. For example:</p>
!
! <pre>
! <Directory ~ "^/www/.*/[0-9]{3}">
! </pre>
!
! would match directories in /www/ that consisted of three numbers.<p>
!
! <p>If multiple directory sections match the directory (or its parents)
containing
a document, then the directives are applied in the order of shortest match
first, interspersed with the directives from the
<A HREF="#accessfilename">.htaccess</A> files. For example, with
***************
*** 530,536 ****
<h2><a name="location"><Location></a></h2>
! <strong>Syntax:</strong> <Location <em>URL prefix</em>><br>
<strong>Context:</strong> server config, virtual host<br>
<strong>Status:</strong> core<br>
<strong>Compatibility:</strong> Location is only available in Apache
--- 571,578 ----
<h2><a name="location"><Location></a></h2>
! <strong>Syntax:</strong> <Location <em>URL</em>>
! ... </Location><br>
<strong>Context:</strong> server config, virtual host<br>
<strong>Status:</strong> core<br>
<strong>Compatibility:</strong> Location is only available in Apache
***************
*** 554,562 ****
string, `?' matches any single character, and `*' matches any
sequences of characters.
! <p>This functionality is especially useful when combined with the
! <code><a href="mod_mime.html#sethandler">SetHandler</a></code>
! directive. For example, to enable status requests, but allow them only
from browsers at foo.com, you might use:
<pre>
--- 596,616 ----
string, `?' matches any single character, and `*' matches any
sequences of characters.
! <p><strong>Apache 1.2 and above:</strong>
! Extended regular expressions can also be used, with the addition of
! the
! <code>~</code> character. For example:</p>
!
! <pre>
! <Location ~ "/(extra|special)/data">
! </pre>
!
! would match URLs that contained the substring "/extra/data" or
! "/special/data".</p>
!
! <p>The <code>Location</code> functionality is especially useful when
! combined with the <code><a
! href="mod_mime.html#sethandler">SetHandler</a></code> directive. For
example, to enable status requests, but allow them only
from browsers at foo.com, you might use:
<pre>
