From: Graham Leggett Date: Wed, 13 Oct 2010 18:44:08 +0000 (+0000) Subject: Update transformations. X-Git-Tag: 2.3.9~324 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=268739ec4c805719512eb1c9e893ad12fac959fc;p=thirdparty%2Fapache%2Fhttpd.git Update transformations. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1022233 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/man/htcacheclean.8 b/docs/man/htcacheclean.8 index 59351733605..69b23391601 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-10-04" "Apache HTTP Server" "htcacheclean" +.TH "HTCACHECLEAN" 8 "2010-10-13" "Apache HTTP Server" "htcacheclean" .SH NAME htcacheclean \- Clean up the disk cache @@ -27,10 +27,10 @@ htcacheclean \- Clean up the disk cache .SH "SYNOPSIS" .PP -\fBhtcacheclean\fR [ -\fBD\fR ] [ -\fBv\fR ] [ -\fBt\fR ] [ -\fBr\fR ] [ -\fBn\fR ] [ -\fBR\fR\fIround\fR ] -\fBp\fR\fIpath\fR -\fBl\fR\fIlimit\fR +\fBhtcacheclean\fR [ -\fBD\fR ] [ -\fBv\fR ] [ -\fBt\fR ] [ -\fBr\fR ] [ -\fBn\fR ] [ -\fBR\fR\fIround\fR ] -\fBp\fR\fIpath\fR [-\fBl\fR\fIlimit\fR| -\fBL\fR\fIlimit\fR] .PP -\fBhtcacheclean\fR [ -\fBn\fR ] [ -\fBt\fR ] [ -\fBi\fR ] [ -\fBP\fR\fIpidfile\fR ] [ -\fBR\fR\fIround\fR ] -\fBd\fR\fIinterval\fR -\fBp\fR\fIpath\fR -\fBl\fR\fIlimit\fR +\fBhtcacheclean\fR [ -\fBn\fR ] [ -\fBt\fR ] [ -\fBi\fR ] [ -\fBP\fR\fIpidfile\fR ] [ -\fBR\fR\fIround\fR ] -\fBd\fR\fIinterval\fR -\fBp\fR\fIpath\fR [-\fBl\fR\fIlimit\fR| -\fBL\fR\fIlimit\fR] .PP \fBhtcacheclean\fR [ -\fBv\fR ] [ -\fBR\fR\fIround\fR ] -\fBp\fR\fIpath\fR [ -\fBa\fR ] [ -\fBA\fR ] @@ -42,7 +42,7 @@ htcacheclean \- Clean up the disk cache .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 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\&. +htcacheclean is used to keep the size of mod_disk_cache's storage within a given size limit, or limit on inodes in use\&. 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" @@ -53,7 +53,7 @@ htcacheclean is used to keep the size of mod_disk_cache's storage within a certa Daemonize and repeat cache cleaning every \fIinterval\fR minutes\&. This option is mutually exclusive with the -D, -v and -r options\&. To shutdown the daemon cleanly, just send it a SIGTERM or SIGINT\&. .TP -D -Do a dry run and don't delete anything\&. This option is mutually exclusive with the -d option\&. +Do a dry run and don't delete anything\&. This option is mutually exclusive with the -d option\&. When doing a dry run and deleting directories with -t, the inodes reported deleted in the stats cannot take into account the directories deleted, and will be marked as an estimate\&. .TP -v Be verbose and print statistics\&. This option is mutually exclusive with the -d option\&. @@ -79,6 +79,9 @@ Specify \fIround\fR as the amount to round sizes up to, to compensate for disk b -l\fIlimit\fR Specify \fIlimit\fR as the total disk cache size limit\&. The value is expressed in bytes by default (or attaching B to the number)\&. Attach K for Kbytes or M for MBytes\&. .TP +-L\fIlimit\fR +Specify \fIlimit\fR as the total disk cache inode limit\&. +.TP -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\&. .TP diff --git a/docs/manual/developer/new_api_2_4.html.en b/docs/manual/developer/new_api_2_4.html.en index 8c09bfac876..b164512488d 100644 --- a/docs/manual/developer/new_api_2_4.html.en +++ b/docs/manual/developer/new_api_2_4.html.en @@ -175,12 +175,28 @@

Introduces the new provider framework for authn and authz

+

mod_cache (changed)

+ +

Introduces a commit_entity() function to the cache provider interface, + allowing atomic writes to cache. Add a cache_status() hook to report + the cache decision. Remove all private structures and functions from the + public mod_cache.h header file.

+ +

mod_core (NEW!)

This introduces low-level APIs to send arbitrary headers, and exposes functions to handle HTTP OPTIONS and TRACE.

+

mod_disk_cache (changed)

+ +

Changes the disk format of the disk cache to support atomic cache + updates without locking. The device/inode pair of the body file is + embedded in the header file, allowing confirmation that the header + and body belong to one another.

+ +

mod_request (NEW!)

The API for mod_request, to make input data diff --git a/docs/manual/new_features_2_4.html.en b/docs/manual/new_features_2_4.html.en index 397c6aff2fa..de2b83e2d55 100644 --- a/docs/manual/new_features_2_4.html.en +++ b/docs/manual/new_features_2_4.html.en @@ -83,6 +83,22 @@

mod_proxy_fcgi
FastCGI Protocol backend for mod_proxy
+ +
mod_cache
+ +
mod_cache can now cache HEAD requests.
+ +
Where possible, mod_cache directives can now be set + per directory, instead of per server.
+ +
The base URL of cached URLs can be customised, so that a cluster of + caches can share the same endpoint URL prefix.
+ +
mod_cache is now capable of serving stale cached + data when a backend is unavailable (error 5xx).
+ +
mod_cache can now insert HIT/MISS/REVALIDATE into + an X-Cache header.
top
@@ -91,6 +107,16 @@
fcgistarter
FastCGI deamon starter utility
+
htcacheclean
+
Current cached URLs can now be listed, with optional metadata + included.
+
Allow explicit deletion of individual cached URLs from the + cache.
+
File sizes can now be rounded up to the given block size, making + the size limits map more closely to the real size on disk.
+
Cache size can now be limited by the number of inodes, instead + of or in addition to being limited by the size of the files on + disk.
top
@@ -134,6 +160,13 @@ files, and a memcache distributed cache are currently supported. +
Cache Status Hook Added
+ +
The mod_cache module now includes a new + cache_status hook, which is called when the caching + decision becomes known. A default implementation is provided + which adds an optional X-Cache and + X-Cache-Detail header to the response.

The developer documentation contains a diff --git a/docs/manual/programs/htcacheclean.html.en b/docs/manual/programs/htcacheclean.html.en index 34a98064508..89b963faedb 100644 --- a/docs/manual/programs/htcacheclean.html.en +++ b/docs/manual/programs/htcacheclean.html.en @@ -24,14 +24,14 @@

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.

+ mod_disk_cache's storage within a given size limit, or + limit on inodes in use. 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.