From: Graham Leggett Date: Mon, 29 Mar 2010 22:32:37 +0000 (+0000) Subject: Update transformations. X-Git-Tag: 2.3.6~275 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=db53b0ad4f0d13a2e9199c141bb1bed7eb6929a6;p=apache Update transformations. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@928922 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/man/htcacheclean.8 b/docs/man/htcacheclean.8 index 371c8e9288..66b237b0bf 100644 --- a/docs/man/htcacheclean.8 +++ b/docs/man/htcacheclean.8 @@ -19,7 +19,7 @@ .el .ne 3 .IP "\\$1" \\$2 .. -.TH "HTCACHECLEAN" 8 "2010-02-16" "Apache HTTP Server" "htcacheclean" +.TH "HTCACHECLEAN" 8 "2010-03-29" "Apache HTTP Server" "htcacheclean" .SH NAME htcacheclean \- Clean up the disk cache @@ -32,11 +32,14 @@ htcacheclean \- Clean up the disk cache .PP \fBhtcacheclean\fR [ -\fBn\fR ] [ -\fBt\fR ] [ -\fBi\fR ] [ -\fBP\fR\fIpidfile\fR ] -\fBd\fR\fIinterval\fR -\fBp\fR\fIpath\fR -\fBl\fR\fIlimit\fR +.PP +\fBhtcacheclean\fR [ -\fBD\fR ] [ -\fBv\fR ] [ -\fBt\fR ] -\fBp\fR\fIpath\fR \fIurl\fR + .SH "SUMMARY" .PP -htcacheclean is used to keep the size of mod_disk_cache's storage within a certain limit\&. This tool can run either manually or in daemon mode\&. When running in daemon mode, it sleeps in the background and checks the cache directories at regular intervals for cached content to be removed\&. You can stop the daemon cleanly by sending it a TERM or INT signal\&. +htcacheclean is used to keep the size of mod_disk_cache's storage within a certain limit\&. This tool can run either manually or in daemon mode\&. When running in daemon mode, it sleeps in the background and checks the cache directory at regular intervals for cached content to be removed\&. You can stop the daemon cleanly by sending it a TERM or INT signal\&. When run manually, a once off check of the cache directory is made for cached content to be removed\&. If one or more URLs are specified, each URL will be deleted from the cache, if present\&. .SH "OPTIONS" @@ -73,8 +76,16 @@ Specify \fIlimit\fR as the total disk cache size limit\&. The value is expressed -i Be intelligent and run only when there was a modification of the disk cache\&. This option is only possible together with the -d option\&. +.SH "DELETING A SPECIFIC URL" + +.PP +If htcacheclean is passed one or more URLs, each URL will be deleted from the cache\&. If multiple variants of an URL exists, all variants would be deleted\&. + +.PP +When a reverse proxied URL is to be deleted, the effective URL is constructed from the \fBHost\fR header, the \fBport\fR, the \fBpath\fR and the \fBquery\fR\&. Note the '?' in the URL must always be specified explicitly, whether a query string is present or not\&. For example, an attempt to delete the path \fB/\fR from the server \fBlocalhost\fR, the URL to delete would be \fBhttp://localhost:80/?\fR\&. + .SH "EXIT STATUS" .PP -htcacheclean returns a zero status ("true") if all operations were successful, 1 otherwise\&. +htcacheclean returns a zero status ("true") if all operations were successful, 1 otherwise\&. If an URL is specified, and the URL was cached and successfully removed, 0 is returned, 2 otherwise\&. If an error occurred during URL removal, 1 is returned\&. diff --git a/docs/manual/install.xml.meta b/docs/manual/install.xml.meta index 74cb344207..377d493477 100644 --- a/docs/manual/install.xml.meta +++ b/docs/manual/install.xml.meta @@ -10,7 +10,7 @@ de en es - fr + fr ja ko tr diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index a8f21bf12d..eca11f91b9 100644 --- a/docs/manual/mod/core.html.en +++ b/docs/manual/mod/core.html.en @@ -61,6 +61,7 @@ available
  • <IfDefine>
  • <IfModule>
  • Include
    • +
  • IncludeStrict
  • KeepAlive
  • KeepAliveTimeout
  • <Limit>
    • @@ -1573,7 +1574,8 @@ later. - + @@ -1604,6 +1606,11 @@ wildcard matching available in 2.3.6 and later 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.

    +

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

    @@ -1630,6 +1637,48 @@ wildcard matching available in 2.3.6 and later

    +

    See also

    + + +
    top
    +

    IncludeStrict Directive

    +
    Description:Includes other configuration files from within the server configuration files
    Syntax:Include file-path|directory-path
    Syntax:Include 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.

    + +

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

    + +

    See also