Return-Path: Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 15362 invoked by uid 500); 18 Jan 2003 16:28:48 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 15351 invoked by uid 500); 18 Jan 2003 16:28:48 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Date: 18 Jan 2003 16:28:47 -0000 Message-ID: <20030118162847.93104.qmail@icarus.apache.org> From: kess@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/docs/manual/mod core.xml core.html.en X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N kess 2003/01/18 08:28:47 Modified: docs/manual/mod Tag: APACHE_2_0_BRANCH core.xml core.html.en Log: - specify some mistakables discussed while reviewing the german translation - set a link from AccessFileName to AllowOverride - and sections and .htaccess files may be used for more then access control - state an example more precisely Thanks to Michael Schroepl and nd for their suggestions. Revision Changes Path No revision No revision 1.46.2.7 +34 -31 httpd-2.0/docs/manual/mod/core.xml Index: core.xml =================================================================== RCS file: /home/cvs/httpd-2.0/docs/manual/mod/core.xml,v retrieving revision 1.46.2.6 retrieving revision 1.46.2.7 diff -u -r1.46.2.6 -r1.46.2.7 --- core.xml 8 Jan 2003 20:04:52 -0000 1.46.2.6 +++ core.xml 18 Jan 2003 16:28:46 -0000 1.46.2.7 @@ -53,7 +53,7 @@ trailing pathname information is determined by the handler responsible for the request. The core handler for normal files defaults to rejecting - PATH_INFO. Handlers that serve scripts, such as PATH_INFO requests. Handlers that serve scripts, such as cgi-script and isapi-isa, generally accept PATH_INFO by default. @@ -93,8 +93,8 @@

While processing a request the server looks for the first existing configuration file from this list of names in every directory of the path to the document, if distributed - configuration files are enabled for that directory. For - example:

+ configuration files are enabled for that + directory. For example:

AccessFileName .acl @@ -174,10 +174,10 @@ AddOutputFilterByType DEFLATE text/html text/plain -

If you want the content to be processed by more than one filter, they - have to be separated by semicolons. It's also possible to use one +

If you want the content to be processed by more than one filter, their + names have to be separated by semicolons. It's also possible to use one AddOutputFilterByType directive for each of - them.

+ these filters.

The configuration below causes all script output labeled as text/html to be processed at first by the @@ -196,9 +196,10 @@ Note

Enabling filters with AddOutputFilterByType may fail partially or completely in some cases. For expample, no - filters are applied if the content type falls back to the DefaultType, even if the DefaultType is the same.

+ filters are applied if the MIME-type could not be determined and falls + back to the DefaultType setting, + even if the DefaultType is the + same.

However, if you want to make sure, that the filters will be applied, assign the content type to a resource explicitely, for @@ -228,7 +229,7 @@

When the server finds an .htaccess file (as specified by AccessFileName) it needs to know which directives declared in that file can override - earlier access information.

+ earlier configuration directives.

Only available in <Directory> sections AllowOverride is valid only in @@ -471,11 +472,11 @@ DefaultType image/gif -

would be appropriate for a directory which contained many gif +

would be appropriate for a directory which contained many GIF images with filenames missing the .gif extension.

Note that unlike ForceType, this directive is only + module="core">ForceType, this directive only provides the default mime-type. All other mime-type definitions, including filename extensions, that might identify the media type will override this default.

@@ -536,7 +537,7 @@

If multiple (non-regular expression) Directory sections - match the directory (or its parents) containing a document, + match the directory (or one of its parents) containing a document, then the directives are applied in the order of shortest match first, interspersed with the directives from the .htaccess files. For example, @@ -564,10 +565,11 @@ (disabling .htaccess files).

  • Apply directive AllowOverride FileInfo (for - directory /home/web).
  • + directory /home).
  • Apply any FileInfo directives in - /home/web/.htaccess
  • + /home/.htaccess, /home/web/.htaccess and + /home/web/dir/.htaccess in that order.

    Regular expressions are not considered until after all of the @@ -584,9 +586,11 @@

    the regular expression section won't be considered until after - all normal <Directory>s and .htaccess - files have been applied. Then the regular expression will match on - /home/abc/public_html/abc and be applied.

    + all normal Directorys and + .htaccess files have been applied. Then the regular + expression will match on /home/abc/public_html/abc and + the corresponding Directory will + be applied.

    Note that the default Apache access for <Directory /> is Allow from All. @@ -985,13 +989,12 @@

    The Files directive - provides for access control by filename. It is comparable to the - Directory - directive and Location directives. It should be - matched with a Files directive. The - directives given within this section will be applied to any object - with a basename (last component of filename) matching the + limits the scope of the enclosed directives by filename. It is comparable + to the Directory + and Location + directives. It should be matched with a </Files> + directive. The directives given within this section will be applied to + any object with a basename (last component of filename) matching the specified filename. Files sections are processed in the order they appear in the configuration file, after the

    The FilesMatch directive - provides for access control by filename, just as the Files directive + limits the scope of the enclosed directives by filename, just as the + Files directive does. However, it accepts a regular expression. For example:

    @@ -1308,7 +1311,7 @@ files in a directory that can cause httpd to fail.

    -

    The file path specified may be a fully qualified path (i.e. +

    The file path specified may be a absolute path (i.e. starting with a slash), or may be relative to the ServerRoot directory.

    @@ -1681,7 +1684,7 @@

    The Location directive - provides for access control by URL. It is similar to the + limits the scope of the enclosed directives by URL. It is similar to the Directory directive, and starts a subsection which is terminated with a </Location> directive.

    The LocationMatch directive - provides for access control by URL, in an identical manner to - Location. However, + limits the scope of the enclosed directives by URL, in an identical manner + to Location. However, it takes a regular expression as an argument instead of a simple string. For example:

    1.46.2.11 +34 -27 httpd-2.0/docs/manual/mod/core.html.en Index: core.html.en =================================================================== RCS file: /home/cvs/httpd-2.0/docs/manual/mod/core.html.en,v retrieving revision 1.46.2.10 retrieving revision 1.46.2.11 diff -u -r1.46.2.10 -r1.46.2.11 --- core.html.en 9 Jan 2003 03:15:07 -0000 1.46.2.10 +++ core.html.en 18 Jan 2003 16:28:46 -0000 1.46.2.11 @@ -133,7 +133,7 @@
    Default
    The treatment of requests with trailing pathname information is determined by the handler responsible for the request. The core handler for normal files defaults to rejecting - PATH_INFO. Handlers that serve scripts, such as cgi-script and isapi-isa, generally accept + PATH_INFO requests. Handlers that serve scripts, such as cgi-script and isapi-isa, generally accept PATH_INFO by default.
    @@ -171,8 +171,8 @@

    While processing a request the server looks for the first existing configuration file from this list of names in every directory of the path to the document, if distributed - configuration files are enabled for that directory. For - example:

    + configuration files are enabled for that + directory. For example:

    AccessFileName .acl @@ -252,10 +252,10 @@ AddOutputFilterByType DEFLATE text/html text/plain

    -

    If you want the content to be processed by more than one filter, they - have to be separated by semicolons. It's also possible to use one +

    If you want the content to be processed by more than one filter, their + names have to be separated by semicolons. It's also possible to use one AddOutputFilterByType directive for each of - them.

    + these filters.

    The configuration below causes all script output labeled as text/html to be processed at first by the @@ -274,7 +274,10 @@

    Note

    Enabling filters with AddOutputFilterByType may fail partially or completely in some cases. For expample, no - filters are applied if the content type falls back to the DefaultType, even if the DefaultType is the same.

    + filters are applied if the MIME-type could not be determined and falls + back to the DefaultType setting, + even if the DefaultType is the + same.

    However, if you want to make sure, that the filters will be applied, assign the content type to a resource explicitely, for @@ -307,7 +310,7 @@

    When the server finds an .htaccess file (as specified by AccessFileName) it needs to know which directives declared in that file can override - earlier access information.

    + earlier configuration directives.

    Only available in <Directory> sections

    AllowOverride is valid only in @@ -527,10 +530,10 @@ DefaultType image/gif

    -

    would be appropriate for a directory which contained many gif +

    would be appropriate for a directory which contained many GIF images with filenames missing the .gif extension.

    -

    Note that unlike ForceType, this directive is only +

    Note that unlike ForceType, this directive only provides the default mime-type. All other mime-type definitions, including filename extensions, that might identify the media type will override this default.

    @@ -590,7 +593,7 @@ three numbers.

    If multiple (non-regular expression) <Directory> sections - match the directory (or its parents) containing a document, + match the directory (or one of its parents) containing a document, then the directives are applied in the order of shortest match first, interspersed with the directives from the .htaccess files. For example, with

    @@ -617,10 +620,11 @@ (disabling .htaccess files).
  • Apply directive AllowOverride FileInfo (for - directory /home/web).
  • + directory /home).
  • Apply any FileInfo directives in - /home/web/.htaccess
  • + /home/.htaccess, /home/web/.htaccess and + /home/web/dir/.htaccess in that order.

    Regular expressions are not considered until after all of the @@ -637,9 +641,11 @@

    the regular expression section won't be considered until after - all normal <Directory>s and .htaccess - files have been applied. Then the regular expression will match on - /home/abc/public_html/abc and be applied.

    + all normal <Directory>s and + .htaccess files have been applied. Then the regular + expression will match on /home/abc/public_html/abc and + the corresponding <Directory> will + be applied.

    Note that the default Apache access for <Directory /> is Allow from All. @@ -1036,12 +1042,12 @@ Module:core

    The <Files> directive - provides for access control by filename. It is comparable to the - <Directory> - directive and <Location> directives. It should be - matched with a <Files> directive. The - directives given within this section will be applied to any object - with a basename (last component of filename) matching the + limits the scope of the enclosed directives by filename. It is comparable + to the <Directory> + and <Location> + directives. It should be matched with a </Files> + directive. The directives given within this section will be applied to + any object with a basename (last component of filename) matching the specified filename. <Files> sections are processed in the order they appear in the configuration file, after the <Directory> sections and @@ -1087,7 +1093,8 @@ Module:core

    The <FilesMatch> directive - provides for access control by filename, just as the <Files> directive + limits the scope of the enclosed directives by filename, just as the + <Files> directive does. However, it accepts a regular expression. For example:

    @@ -1347,7 +1354,7 @@ files in a directory that can cause httpd to fail.

    -

    The file path specified may be a fully qualified path (i.e. +

    The file path specified may be a absolute path (i.e. starting with a slash), or may be relative to the ServerRoot directory.

    @@ -1720,7 +1727,7 @@ Module:core

    The <Location> directive - provides for access control by URL. It is similar to the + limits the scope of the enclosed directives by URL. It is similar to the <Directory> directive, and starts a subsection which is terminated with a </Location> directive. <Location> sections are processed in the @@ -1809,8 +1816,8 @@ Module:core

    The <LocationMatch> directive - provides for access control by URL, in an identical manner to - <Location>. However, + limits the scope of the enclosed directives by URL, in an identical manner + to <Location>. However, it takes a regular expression as an argument instead of a simple string. For example: