From: Rich Bowen Date: Sun, 4 Apr 2010 01:28:18 +0000 (+0000) Subject: Rebuild various transformations. X-Git-Tag: 2.3.6~265 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6a14647754a4c06c2db3e54366ecc63defaf3a5f;p=thirdparty%2Fapache%2Fhttpd.git Rebuild various transformations. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@930606 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index eca11f91b9d..8cf9c7262d2 100644 --- a/docs/manual/mod/core.html.en +++ b/docs/manual/mod/core.html.en @@ -61,7 +61,6 @@ available
  • <IfDefine>
  • <IfModule>
  • Include
    • -
  • IncludeStrict
  • KeepAlive
  • KeepAliveTimeout
  • <Limit>
    • @@ -1574,8 +1573,7 @@ later. - + @@ -1596,20 +1594,27 @@ wildcard matching available in 2.3.6 and later wildcard syntax shown below, to include files that match a particular pattern, such as *.conf, for example.

    -

    When a wildcard is specified for a file or directory component of the - path, and no file or directory matches the wildcard, the - Include directive will be - silently ignored. When a directory or file component of the path is +

    When a wildcard is specified for a file component of + the path, and no file matches the wildcard, the + Include + directive will be silently ignored. When a wildcard is + specified for a directory component of the path, and + no directory matches the wildcard, the + Include directive will + fail with an error saying the directory cannot be found. +

    + +

    For further control over the behaviour of the server when no files or + directories match, prefix the path with the modifiers optional + or strict. If optional is specified, any wildcard + file or directory that does not match will be silently ignored. If + strict is specified, any wildcard file or directory that does + not match at least one file will cause server startup to fail.

    + +

    When a directory or file component of the path is specified exactly, and that directory or file does not exist, Include directive will fail with an - error saying the file or directory cannot be found. This removes the need - for placeholder files to exist so that at least one file or directory is - found by the wildcard.

    - -

    Under certain circumstances, it may be required for the server to fail - explicitly when no files or directories match a specific wildcard. In these - cases, use the IncludeStrict - directive instead.

    + error saying the file or directory cannot be found.

    The file path specified may be an absolute path, or may be relative to the ServerRoot directory.

    @@ -1629,54 +1634,28 @@ wildcard matching available in 2.3.6 and later

    Wildcards may be included in the directory or file portion of the - path:

    + path. In the following example, the server will fail to load if no + directories match conf/vhosts/*, but will load successfully if no + files match *.conf.

    - Include conf/vhosts/*/vhost.conf + Include conf/vhosts/*/vhost.conf
    Include conf/vhosts/*/*.conf

    +

    In this example, the server will fail to load if either + conf/vhosts/* matches no directories, or if *.conf matches no files:

    -

    See also

    - - -
    top
    -

    IncludeStrict Directive

    -
    Description:Includes other configuration files from within the server configuration files
    Syntax:Include file-path|directory-path| -wildcard
    Syntax:Include [optional|strict] file-path|directory-path|wildcard
    Context:server config, virtual host, directory
    Status:Core
    Module:core
    - - - - - - -
    Description:Includes other configuration files from within the server -configuration files, throwing an error if no files or directories match -a wildcard -
    Syntax:IncludeStrict file-path|directory-path| -wildcard
    Context:server config, virtual host, directory
    Status:Core
    Module:core
    Compatibility:Available in 2.3.6 and later
    -

    This directive allows inclusion of other configuration files - from within the server configuration files.

    - -

    It is functionally equivalent to the - Include directive, with the additional - restriction that any wildcards are required to match at least one file or - directory.

    - -

    The file path specified may be an absolute path, or may be relative - to the ServerRoot directory.

    - -

    Example:

    - -

    The server will fail to load if the wildcard path - /usr/local/apache2/conf/vhosts/*.conf does not match at least - one file or directory.

    +

    + Include strict conf/vhosts/*/*.conf +

    + +

    In this example, the server load successfully if either conf/vhosts/* + matches no directories, or if *.conf matches no files:

    -

    - IncludeStrict /usr/local/apache2/conf/ssl.conf
    - IncludeStrict /usr/local/apache2/conf/vhosts/*.conf -

    +

    + Include optional conf/vhosts/*/*.conf +

    See also

    diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de index 67193d81eda..df7477b42af 100644 --- a/docs/manual/mod/core.xml.de +++ b/docs/manual/mod/core.xml.de @@ -1,7 +1,7 @@ - + + +