From: Graham Leggett Date: Sun, 25 Mar 2012 22:35:18 +0000 (+0000) Subject: Update transformations. X-Git-Tag: 2.5.0-alpha~7306 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=53302ff0ec12c5e18047045ea050c6ae5f78e28e;p=apache Update transformations. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1305167 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/developer/new_api_2_4.html.en b/docs/manual/developer/new_api_2_4.html.en index 0fe9d23e38..3268871c9d 100644 --- a/docs/manual/developer/new_api_2_4.html.en +++ b/docs/manual/developer/new_api_2_4.html.en @@ -70,8 +70,6 @@

ap_mpm_run is replaced by a new mpm hook. Also ap_graceful_stop_signalled is lost, and ap_mpm_register_timed_callback is new.

-

ap_mpm_query is not longer available in the register hooks - phase during startup.

ap_regex (changed)

diff --git a/docs/manual/mod/allmodules.xml b/docs/manual/mod/allmodules.xml index 33ed033c2e..7cea38ff5d 100644 --- a/docs/manual/mod/allmodules.xml +++ b/docs/manual/mod/allmodules.xml @@ -29,6 +29,7 @@ mod_buffer.xml mod_cache.xml mod_cache_disk.xml + mod_cache_socache.xml mod_cern_meta.xml mod_cgi.xml mod_cgid.xml diff --git a/docs/manual/mod/allmodules.xml.de b/docs/manual/mod/allmodules.xml.de index 89dff50ae1..300e72a246 100644 --- a/docs/manual/mod/allmodules.xml.de +++ b/docs/manual/mod/allmodules.xml.de @@ -29,6 +29,7 @@ mod_buffer.xml mod_cache.xml mod_cache_disk.xml + mod_cache_socache.xml mod_cern_meta.xml mod_cgi.xml mod_cgid.xml diff --git a/docs/manual/mod/allmodules.xml.es b/docs/manual/mod/allmodules.xml.es index 1ce7d70386..6b66d1d959 100644 --- a/docs/manual/mod/allmodules.xml.es +++ b/docs/manual/mod/allmodules.xml.es @@ -29,6 +29,7 @@ mod_buffer.xml mod_cache.xml mod_cache_disk.xml + mod_cache_socache.xml mod_cern_meta.xml mod_cgi.xml mod_cgid.xml diff --git a/docs/manual/mod/allmodules.xml.fr b/docs/manual/mod/allmodules.xml.fr index 31828822aa..0dabbc6af5 100644 --- a/docs/manual/mod/allmodules.xml.fr +++ b/docs/manual/mod/allmodules.xml.fr @@ -29,6 +29,7 @@ mod_buffer.xml.fr mod_cache.xml.fr mod_cache_disk.xml.fr + mod_cache_socache.xml mod_cern_meta.xml mod_cgi.xml mod_cgid.xml diff --git a/docs/manual/mod/allmodules.xml.ja b/docs/manual/mod/allmodules.xml.ja index b32fcb16cf..77eaac3ace 100644 --- a/docs/manual/mod/allmodules.xml.ja +++ b/docs/manual/mod/allmodules.xml.ja @@ -29,6 +29,7 @@ mod_buffer.xml mod_cache.xml.ja mod_cache_disk.xml.ja + mod_cache_socache.xml mod_cern_meta.xml mod_cgi.xml.ja mod_cgid.xml.ja diff --git a/docs/manual/mod/allmodules.xml.ko b/docs/manual/mod/allmodules.xml.ko index 0e36909c77..f43b87b311 100644 --- a/docs/manual/mod/allmodules.xml.ko +++ b/docs/manual/mod/allmodules.xml.ko @@ -29,6 +29,7 @@ mod_buffer.xml mod_cache.xml.ko mod_cache_disk.xml.ko + mod_cache_socache.xml mod_cern_meta.xml.ko mod_cgi.xml.ko mod_cgid.xml.ko diff --git a/docs/manual/mod/allmodules.xml.tr b/docs/manual/mod/allmodules.xml.tr index 36c2851abd..68e3c72f27 100644 --- a/docs/manual/mod/allmodules.xml.tr +++ b/docs/manual/mod/allmodules.xml.tr @@ -29,6 +29,7 @@ mod_buffer.xml mod_cache.xml mod_cache_disk.xml + mod_cache_socache.xml mod_cern_meta.xml mod_cgi.xml mod_cgid.xml diff --git a/docs/manual/mod/allmodules.xml.zh-cn b/docs/manual/mod/allmodules.xml.zh-cn index 33ed033c2e..7cea38ff5d 100644 --- a/docs/manual/mod/allmodules.xml.zh-cn +++ b/docs/manual/mod/allmodules.xml.zh-cn @@ -29,6 +29,7 @@ mod_buffer.xml mod_cache.xml mod_cache_disk.xml + mod_cache_socache.xml mod_cern_meta.xml mod_cgi.xml mod_cgid.xml diff --git a/docs/manual/mod/core.xml.meta b/docs/manual/mod/core.xml.meta index b9d96ee4c5..e78755527a 100644 --- a/docs/manual/mod/core.xml.meta +++ b/docs/manual/mod/core.xml.meta @@ -10,7 +10,7 @@ de en es - fr + fr ja tr diff --git a/docs/manual/mod/directives.html.en b/docs/manual/mod/directives.html.en index b14fab7eb3..504a527ed2 100644 --- a/docs/manual/mod/directives.html.en +++ b/docs/manual/mod/directives.html.en @@ -177,6 +177,12 @@
  • CacheReadSize
  • CacheReadTime
  • CacheRoot
    • +
  • CacheSocache
    • +
  • CacheSocacheMaxSize
    • +
  • CacheSocacheMaxTime
    • +
  • CacheSocacheMinTime
    • +
  • CacheSocacheReadSize
    • +
  • CacheSocacheReadTime
  • CacheStaleOnError
  • CacheStoreExpired
  • CacheStoreNoStore
    • diff --git a/docs/manual/mod/index.html.en b/docs/manual/mod/index.html.en index 601b5dabd7..92c8711982 100644 --- a/docs/manual/mod/index.html.en +++ b/docs/manual/mod/index.html.en @@ -103,6 +103,8 @@ address)
    mod_buffer
    Support for request buffering
    mod_cache
    RFC 2616 compliant HTTP caching filter.
    mod_cache_disk
    Disk based storage module for the HTTP caching filter.
    +
    mod_cache_socache
    Shared object cache (socache) based storage module for the +HTTP caching filter.
    mod_cern_meta
    CERN httpd metafile semantics
    mod_cgi
    Execution of CGI scripts
    mod_cgid
    Execution of CGI scripts using an diff --git a/docs/manual/mod/mod_autoindex.html.en b/docs/manual/mod/mod_autoindex.html.en index b47a197351..76c0bbc3dc 100644 --- a/docs/manual/mod/mod_autoindex.html.en +++ b/docs/manual/mod/mod_autoindex.html.en @@ -506,7 +506,7 @@ of the index listing

    See also

    top
    diff --git a/docs/manual/mod/mod_autoindex.xml.ja b/docs/manual/mod/mod_autoindex.xml.ja index d624ec5891..91ca85e3ff 100644 --- a/docs/manual/mod/mod_autoindex.xml.ja +++ b/docs/manual/mod/mod_autoindex.xml.ja @@ -1,7 +1,7 @@ - + + + +mod_cache_socache - Apache HTTP Server + + + + + +
    +

    Modules | Directives | FAQ | Glossary | Sitemap

    +

    Apache HTTP Server Version 2.5

    +
    +
    <-
    + +
    +

    Apache Module mod_cache_socache

    +
    +

    Available Languages:  en 

    +
    + + + +
    Description:Shared object cache (socache) based storage module for the +HTTP caching filter.
    Status:Extension
    Module Identifier:cache_socache_module
    Source File:mod_cache_socache.c
    +

    Summary

    + +

    mod_cache_socache implements a shared object cache + (socache) based storage manager for mod_cache.

    + +

    The headers and bodies of cached responses are combined, and stored + underneath a single key in the shared object cache. A + number of implementations of shared object + caches are available to choose from.

    + +

    Multiple content negotiated responses can be stored concurrently, + however the caching of partial content is not yet supported by this + module.

    + +

    + # Turn on caching
    + CacheSocache shmcb
    + CacheSocacheMaxSize 102400
    + <Location /foo>
    + + CacheEnable socache
    +     + </Location>
    +
    + # Fall back to the disk cache
    + CacheSocache shmcb
    + CacheSocacheMaxSize 102400
    + <Location /foo>
    + + CacheEnable socache
    + CacheEnable disk
    +     + </Location>
    +

    + +

    Note:

    +

    mod_cache_socache requires the services of + mod_cache, which must be loaded before + mod_cache_socache.

    +
    +
    + + +
    top
    +

    CacheSocache Directive

    + + + + + + + +
    Description:The directory root under which cache files are +stored
    Syntax:CacheSocache type[:args]
    Context:server config, virtual host
    Status:Extension
    Module:mod_cache_socache
    Compatibility:Available in Apache 2.5 and later
    +

    The CacheSocache directive defines the name of + the shared object cache implementation to use, followed by optional + arguments for that implementation. A number of + implementations of shared object caches are available to choose + from.

    + +

    + CacheSocache shmcb +

    + +
    +
    top
    +

    CacheSocacheMaxSize Directive

    + + + + + + + + +
    Description:The maximum size (in bytes) of an entry to be placed in the +cache
    Syntax:CacheSocacheMaxSize bytes
    Default:CacheSocacheMaxSize 102400
    Context:server config, virtual host, directory, .htaccess
    Status:Extension
    Module:mod_cache_socache
    Compatibility:Available in Apache 2.5 and later
    +

    The CacheSocacheMaxSize directive sets the + maximum size, in bytes, for the combined headers and body of a document + to be considered for storage in the cache. The larger the headers that + are stored alongside the body, the smaller the body may be.

    + +

    The mod_cache_socache module will only attempt to + cache responses that have an explicit content length, or that are small + enough to be written in one pass. This is done to allow the + mod_cache_disk module to have an opportunity to cache + responses larger than those cacheable within + mod_cache_socache.

    + +

    + CacheSocacheMaxSize 102400 +

    + +
    +
    top
    +

    CacheSocacheMaxTime Directive

    + + + + + + + + +
    Description:The maximum time (in seconds) for a document to be placed in the +cache
    Syntax:CacheSocacheMaxTime seconds
    Default:CacheSocacheMaxTime 86400
    Context:server config, virtual host, directory, .htaccess
    Status:Extension
    Module:mod_cache_socache
    Compatibility:Available in Apache 2.5 and later
    +

    The CacheSocacheMaxTime directive sets the + maximum freshness lifetime, in seconds, for a document to be stored in + the cache. This value overrides the freshness lifetime defined for the + document by the HTTP protocol.

    + +

    + CacheSocacheMaxTime 86400 +

    + +
    +
    top
    +

    CacheSocacheMinTime Directive

    + + + + + + + + +
    Description:The maximum time (in seconds) for a document to be placed in the +cache
    Syntax:CacheSocacheMinTime seconds
    Default:CacheSocacheMinTime 600
    Context:server config, virtual host, directory, .htaccess
    Status:Extension
    Module:mod_cache_socache
    Compatibility:Available in Apache 2.5 and later
    +

    The CacheSocacheMinTime directive sets the + amount of seconds beyond the freshness lifetime of the response that the + response should be cached for in the shared object cache. If a response is + only stored for its freshness lifetime, there will be no opportunity to + revalidate the response to make it fresh again.

    + +

    + CacheSocacheMinTime 600 +

    + +
    +
    top
    +

    CacheSocacheReadSize Directive

    + + + + + + + + +
    Description:The minimum size (in bytes) of the document to read and be cached + before sending the data downstream
    Syntax:CacheSocacheReadSize bytes
    Default:CacheSocacheReadSize 0
    Context:server config, virtual host, directory, .htaccess
    Status:Extension
    Module:mod_cache_socache
    Compatibility:Available in Apache 2.5 and later
    +

    The CacheSocacheReadSize directive sets the + minimum amount of data, in bytes, to be read from the backend before the + data is sent to the client. The default of zero causes all data read of + any size to be passed downstream to the client immediately as it arrives. + Setting this to a higher value causes the disk cache to buffer at least + this amount before sending the result to the client. This can improve + performance when caching content from a slow reverse proxy.

    + +

    This directive only takes effect when the data is being saved to the + cache, as opposed to data being served from the cache.

    + +

    + CacheReadSize 102400 +

    + +
    +
    top
    +

    CacheSocacheReadTime Directive

    + + + + + + + + +
    Description:The minimum time (in milliseconds) that should elapse while reading + before data is sent downstream
    Syntax:CacheSocacheReadTime milliseconds
    Default:CacheSocacheReadTime 0
    Context:server config, virtual host, directory, .htaccess
    Status:Extension
    Module:mod_cache_socache
    Compatibility:Available in Apache 2.5 and later
    +

    The CacheSocacheReadTime directive sets the minimum amount + of elapsed time that should pass before making an attempt to send data + downstream to the client. During the time period, data will be buffered + before sending the result to the client. This can improve performance when + caching content from a reverse proxy.

    + +

    The default of zero disables this option.

    + +

    This directive only takes effect when the data is being saved to the + cache, as opposed to data being served from the cache. It is recommended + that this option be used alongside the + CacheSocacheReadSize directive + to ensure that the server does not buffer excessively should data arrive faster + than expected.

    + +

    + CacheSocacheReadTime 1000 +

    + +
    +
    +
    +

    Available Languages:  en 

    +
    + \ No newline at end of file diff --git a/docs/manual/mod/mod_cache_socache.xml b/docs/manual/mod/mod_cache_socache.xml new file mode 100644 index 0000000000..5450137f66 --- /dev/null +++ b/docs/manual/mod/mod_cache_socache.xml @@ -0,0 +1,247 @@ + + + + + + + + + +mod_cache_socache +Shared object cache (socache) based storage module for the +HTTP caching filter. +Extension +mod_cache_socache.c +cache_socache_module + + +

    mod_cache_socache implements a shared object cache + (socache) based storage manager for mod_cache.

    + +

    The headers and bodies of cached responses are combined, and stored + underneath a single key in the shared object cache. A + number of implementations of shared object + caches are available to choose from.

    + +

    Multiple content negotiated responses can be stored concurrently, + however the caching of partial content is not yet supported by this + module.

    + + + # Turn on caching
    + CacheSocache shmcb
    + CacheSocacheMaxSize 102400
    + <Location /foo>
    + + CacheEnable socache
    +     + </Location>
    +
    + # Fall back to the disk cache
    + CacheSocache shmcb
    + CacheSocacheMaxSize 102400
    + <Location /foo>
    + + CacheEnable socache
    + CacheEnable disk
    +     + </Location>
    +     + + Note: +

    mod_cache_socache requires the services of + mod_cache, which must be loaded before + mod_cache_socache.

    +     +     +mod_cache +mod_cache_disk +Caching Guide + + +CacheSocache +The directory root under which cache files are +stored +CacheSocache type[:args] +server configvirtual host + +Available in Apache 2.5 and later + + +

    The CacheSocache directive defines the name of + the shared object cache implementation to use, followed by optional + arguments for that implementation. A number of + implementations of shared object caches are available to choose + from.

    + + + CacheSocache shmcb + +     +     + + +CacheSocacheMaxTime +The maximum time (in seconds) for a document to be placed in the +cache +CacheSocacheMaxTime seconds +CacheSocacheMaxTime 86400 +server config + virtual host + directory + .htaccess + +Available in Apache 2.5 and later + + +

    The CacheSocacheMaxTime directive sets the + maximum freshness lifetime, in seconds, for a document to be stored in + the cache. This value overrides the freshness lifetime defined for the + document by the HTTP protocol.

    + + + CacheSocacheMaxTime 86400 + +     +     + + +CacheSocacheMinTime +The maximum time (in seconds) for a document to be placed in the +cache +CacheSocacheMinTime seconds +CacheSocacheMinTime 600 +server config + virtual host + directory + .htaccess + +Available in Apache 2.5 and later + + +

    The CacheSocacheMinTime directive sets the + amount of seconds beyond the freshness lifetime of the response that the + response should be cached for in the shared object cache. If a response is + only stored for its freshness lifetime, there will be no opportunity to + revalidate the response to make it fresh again.

    + + + CacheSocacheMinTime 600 + +     +     + + +CacheSocacheMaxSize +The maximum size (in bytes) of an entry to be placed in the +cache +CacheSocacheMaxSize bytes +CacheSocacheMaxSize 102400 +server config + virtual host + directory + .htaccess + +Available in Apache 2.5 and later + + +

    The CacheSocacheMaxSize directive sets the + maximum size, in bytes, for the combined headers and body of a document + to be considered for storage in the cache. The larger the headers that + are stored alongside the body, the smaller the body may be.

    + +

    The mod_cache_socache module will only attempt to + cache responses that have an explicit content length, or that are small + enough to be written in one pass. This is done to allow the + mod_cache_disk module to have an opportunity to cache + responses larger than those cacheable within + mod_cache_socache.

    + + + CacheSocacheMaxSize 102400 + +     +     + + +CacheSocacheReadSize +The minimum size (in bytes) of the document to read and be cached + before sending the data downstream +CacheSocacheReadSize bytes +CacheSocacheReadSize 0 +server config + virtual host + directory + .htaccess + +Available in Apache 2.5 and later + + +

    The CacheSocacheReadSize directive sets the + minimum amount of data, in bytes, to be read from the backend before the + data is sent to the client. The default of zero causes all data read of + any size to be passed downstream to the client immediately as it arrives. + Setting this to a higher value causes the disk cache to buffer at least + this amount before sending the result to the client. This can improve + performance when caching content from a slow reverse proxy.

    + +

    This directive only takes effect when the data is being saved to the + cache, as opposed to data being served from the cache.

    + + + CacheReadSize 102400 + +     +     + + +CacheSocacheReadTime +The minimum time (in milliseconds) that should elapse while reading + before data is sent downstream +CacheSocacheReadTime milliseconds +CacheSocacheReadTime 0 +server config + virtual host + directory + .htaccess + +Available in Apache 2.5 and later + + +

    The CacheSocacheReadTime directive sets the minimum amount + of elapsed time that should pass before making an attempt to send data + downstream to the client. During the time period, data will be buffered + before sending the result to the client. This can improve performance when + caching content from a reverse proxy.

    + +

    The default of zero disables this option.

    + +

    This directive only takes effect when the data is being saved to the + cache, as opposed to data being served from the cache. It is recommended + that this option be used alongside the + CacheSocacheReadSize directive + to ensure that the server does not buffer excessively should data arrive faster + than expected.

    + + + CacheSocacheReadTime 1000 + +     +     + +     diff --git a/docs/manual/mod/mod_cache_socache.xml.meta b/docs/manual/mod/mod_cache_socache.xml.meta new file mode 100644 index 0000000000..983fb086ee --- /dev/null +++ b/docs/manual/mod/mod_cache_socache.xml.meta @@ -0,0 +1,12 @@ + + + + + mod_cache_socache + /mod/ + .. + + + en + + diff --git a/docs/manual/mod/mod_slotmem_shm.html.en b/docs/manual/mod/mod_slotmem_shm.html.en index 00e99df9b9..a4d10d40c2 100644 --- a/docs/manual/mod/mod_slotmem_shm.html.en +++ b/docs/manual/mod/mod_slotmem_shm.html.en @@ -38,7 +38,9 @@ restart, whether graceful or not. The data itself is stored and restored within a file noted by the name parameter in the create and attach - calls. + calls. If not specified with an absolute path, the file will be + created relative to the path specified by the + DefaultRuntimeDir directive.

    mod_slotmem_shm provides the following API functions: @@ -55,9 +57,9 @@

    "none"
    Does not persist shared memory in file.
    "file-name"
    -
    $server_root/file-name
    +
    [DefaultRuntimeDir]/file-name
    "/absolute-file-name"
    -
    $absolute-file-name
    +
    Absolute file name
    apr_status_t attach(ap_slotmem_instance_t **new, const char *name, apr_size_t *item_size, unsigned int *item_num, apr_pool_t *pool)
    diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en index 22668a5a29..12a955a0f5 100644 --- a/docs/manual/mod/quickreference.html.en +++ b/docs/manual/mod/quickreference.html.en @@ -294,6 +294,18 @@ cached by proxy servers before data is sent downstream CacheRoot directorysvEThe directory root under which cache files are stored +CacheSocache type[:args]svEThe directory root under which cache files are +stored +CacheSocacheMaxSize bytes 102400 svdhEThe maximum size (in bytes) of an entry to be placed in the +cache +CacheSocacheMaxTime seconds 86400 svdhEThe maximum time (in seconds) for a document to be placed in the +cache +CacheSocacheMinTime seconds 600 svdhEThe maximum time (in seconds) for a document to be placed in the +cache +CacheSocacheReadSize bytes 0 svdhEThe minimum size (in bytes) of the document to read and be cached + before sending the data downstream +CacheSocacheReadTime milliseconds 0 svdhEThe minimum time (in milliseconds) that should elapse while reading + before data is sent downstream CacheStaleOnError on|off on svdhEServe stale content in place of 5xx responses. CacheStoreExpired On|Off Off svdhEAttempt to cache responses that the server reports as expired CacheStoreNoStore On|Off Off svdhEAttempt to cache requests or responses that have been marked as no-store. diff --git a/docs/manual/new_features_2_0.html.en b/docs/manual/new_features_2_0.html.en index da42946659..2b3dbf4e36 100644 --- a/docs/manual/new_features_2_0.html.en +++ b/docs/manual/new_features_2_0.html.en @@ -225,7 +225,7 @@
    mod_auth_dbm
    Now supports multiple types of DBM-like databases using the - AuthDBMType + AuthDBMType directive.
    diff --git a/docs/manual/new_features_2_0.xml.de b/docs/manual/new_features_2_0.xml.de index 478f15e7c2..b779c294e2 100644 --- a/docs/manual/new_features_2_0.xml.de +++ b/docs/manual/new_features_2_0.xml.de @@ -1,7 +1,7 @@ - + + + + + +