From: Graham Leggett Date: Tue, 6 Dec 2011 14:55:15 +0000 (+0000) Subject: Update transformations. X-Git-Tag: 2.5.0-alpha~7705 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=980f934dbd783535fb83424d0f96e9592559dda0;p=thirdparty%2Fapache%2Fhttpd.git Update transformations. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1210954 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/allmodules.xml.de b/docs/manual/mod/allmodules.xml.de index 2a098de01e5..bd204e82479 100644 --- a/docs/manual/mod/allmodules.xml.de +++ b/docs/manual/mod/allmodules.xml.de @@ -98,6 +98,10 @@ mod_slotmem_plain.xml mod_slotmem_shm.xml mod_so.xml + mod_socache_dbm.xml + mod_socache_dc.xml + mod_socache_memcache.xml + mod_socache_shmcb.xml mod_speling.xml mod_ssl.xml mod_status.xml diff --git a/docs/manual/mod/allmodules.xml.es b/docs/manual/mod/allmodules.xml.es index 2920fd5e6d1..ff7038cb652 100644 --- a/docs/manual/mod/allmodules.xml.es +++ b/docs/manual/mod/allmodules.xml.es @@ -98,6 +98,10 @@ mod_slotmem_plain.xml mod_slotmem_shm.xml mod_so.xml + mod_socache_dbm.xml + mod_socache_dc.xml + mod_socache_memcache.xml + mod_socache_shmcb.xml mod_speling.xml mod_ssl.xml mod_status.xml diff --git a/docs/manual/mod/allmodules.xml.fr b/docs/manual/mod/allmodules.xml.fr index 0a138b9c610..1732a415832 100644 --- a/docs/manual/mod/allmodules.xml.fr +++ b/docs/manual/mod/allmodules.xml.fr @@ -98,6 +98,10 @@ mod_slotmem_plain.xml mod_slotmem_shm.xml mod_so.xml.fr + mod_socache_dbm.xml + mod_socache_dc.xml + mod_socache_memcache.xml + mod_socache_shmcb.xml mod_speling.xml mod_ssl.xml mod_status.xml.fr diff --git a/docs/manual/mod/allmodules.xml.ja b/docs/manual/mod/allmodules.xml.ja index df86179ac1b..ff21f6691fe 100644 --- a/docs/manual/mod/allmodules.xml.ja +++ b/docs/manual/mod/allmodules.xml.ja @@ -98,6 +98,10 @@ mod_slotmem_plain.xml mod_slotmem_shm.xml mod_so.xml.ja + mod_socache_dbm.xml + mod_socache_dc.xml + mod_socache_memcache.xml + mod_socache_shmcb.xml mod_speling.xml.ja mod_ssl.xml mod_status.xml.ja diff --git a/docs/manual/mod/allmodules.xml.ko b/docs/manual/mod/allmodules.xml.ko index b2d25a434bd..714c6736172 100644 --- a/docs/manual/mod/allmodules.xml.ko +++ b/docs/manual/mod/allmodules.xml.ko @@ -98,6 +98,10 @@ mod_slotmem_plain.xml mod_slotmem_shm.xml mod_so.xml.ko + mod_socache_dbm.xml + mod_socache_dc.xml + mod_socache_memcache.xml + mod_socache_shmcb.xml mod_speling.xml.ko mod_ssl.xml mod_status.xml.ko diff --git a/docs/manual/mod/allmodules.xml.tr b/docs/manual/mod/allmodules.xml.tr index 7bc052e74bb..941fcc54ba1 100644 --- a/docs/manual/mod/allmodules.xml.tr +++ b/docs/manual/mod/allmodules.xml.tr @@ -98,6 +98,10 @@ mod_slotmem_plain.xml mod_slotmem_shm.xml mod_so.xml.tr + mod_socache_dbm.xml + mod_socache_dc.xml + mod_socache_memcache.xml + mod_socache_shmcb.xml mod_speling.xml mod_ssl.xml mod_status.xml.tr diff --git a/docs/manual/mod/allmodules.xml.zh-cn b/docs/manual/mod/allmodules.xml.zh-cn index f5195310484..2e0706ca804 100644 --- a/docs/manual/mod/allmodules.xml.zh-cn +++ b/docs/manual/mod/allmodules.xml.zh-cn @@ -98,6 +98,10 @@ mod_slotmem_plain.xml mod_slotmem_shm.xml mod_so.xml + mod_socache_dbm.xml + mod_socache_dc.xml + mod_socache_memcache.xml + mod_socache_shmcb.xml mod_speling.xml mod_ssl.xml mod_status.xml diff --git a/docs/manual/mod/index.html.en b/docs/manual/mod/index.html.en index d15329a3ffc..8b038bb2c3c 100644 --- a/docs/manual/mod/index.html.en +++ b/docs/manual/mod/index.html.en @@ -205,6 +205,10 @@ on characteristics of the request

Slot-based shared memory provider.

Loading of executable code and modules into the server at start-up or restart time

mod_socache_dbm

DBM based shared object cache provider.

mod_socache_dc

Distcache based shared object cache provider.

mod_socache_memcache

Memcache based shared object cache provider.

mod_socache_shmcb

shmcb based shared object cache provider.

mod_speling

Attempts to correct mistaken URLs by ignoring capitalization, or attempting to correct various minor misspellings.

diff --git a/docs/manual/mod/mod_socache_dbm.html b/docs/manual/mod/mod_socache_dbm.html new file mode 100644 index 00000000000..7f8f449bb6f --- /dev/null +++ b/docs/manual/mod/mod_socache_dbm.html @@ -0,0 +1,5 @@ +# GENERATED FROM XML -- DO NOT EDIT + +URI: mod_socache_dbm.html.en +Content-Language: en +Content-type: text/html; charset=ISO-8859-1 diff --git a/docs/manual/mod/mod_socache_dbm.html.en b/docs/manual/mod/mod_socache_dbm.html.en new file mode 100644 index 00000000000..e59fb6f0582 --- /dev/null +++ b/docs/manual/mod/mod_socache_dbm.html.en @@ -0,0 +1,57 @@ + + + +mod_socache_dbm - Apache HTTP Server + + + + + + +

+Apache > HTTP Server > Documentation > Version 2.5 > Modules

Apache Module mod_socache_dbm

Available Languages: en

+ + + +

Description:	DBM based shared object cache provider.
Status:	Extension
Module Identifier:	mod_socache_dbm_module
Source File:	mod_socache_dbm.c

Summary

+ +

mod_socache_dbm is a shared object cache provider + which provides for creation and access to a cache backed by a + DBM database. +

+ +

+ dbm:/path/to/datafile +

+ +

Details of other shared object cache providers can be found + here. +

+ +

Directives

This module provides no + directives.

+ +

Available Languages: en

+ \ No newline at end of file diff --git a/docs/manual/mod/mod_socache_dbm.xml.meta b/docs/manual/mod/mod_socache_dbm.xml.meta new file mode 100644 index 00000000000..036b390f961 --- /dev/null +++ b/docs/manual/mod/mod_socache_dbm.xml.meta @@ -0,0 +1,12 @@ + + + + + mod_socache_dbm + /mod/ + .. + + + en + + diff --git a/docs/manual/mod/mod_socache_dc.html b/docs/manual/mod/mod_socache_dc.html new file mode 100644 index 00000000000..e898ee2a03f --- /dev/null +++ b/docs/manual/mod/mod_socache_dc.html @@ -0,0 +1,5 @@ +# GENERATED FROM XML -- DO NOT EDIT + +URI: mod_socache_dc.html.en +Content-Language: en +Content-type: text/html; charset=ISO-8859-1 diff --git a/docs/manual/mod/mod_socache_dc.html.en b/docs/manual/mod/mod_socache_dc.html.en new file mode 100644 index 00000000000..fe9e78bbf90 --- /dev/null +++ b/docs/manual/mod/mod_socache_dc.html.en @@ -0,0 +1,54 @@ + + + +mod_socache_dc - Apache HTTP Server + + + + + + +

+Apache > HTTP Server > Documentation > Version 2.5 > Modules

Apache Module mod_socache_dc

Available Languages: en

+ + + +

Description:	Distcache based shared object cache provider.
Status:	Extension
Module Identifier:	mod_socache_dc_module
Source File:	mod_socache_dc.c

Summary

+ +

mod_socache_dc is a shared object cache provider + which provides for creation and access to a cache backed by the + distcache + distributed session caching libraries. +

+ +

Details of other shared object cache providers can be found + here. +

+ +

Directives

This module provides no + directives.

+ +

Available Languages: en

+ \ No newline at end of file diff --git a/docs/manual/mod/mod_socache_dc.xml.meta b/docs/manual/mod/mod_socache_dc.xml.meta new file mode 100644 index 00000000000..78c76b73a64 --- /dev/null +++ b/docs/manual/mod/mod_socache_dc.xml.meta @@ -0,0 +1,12 @@ + + + + + mod_socache_dc + /mod/ + .. + + + en + + diff --git a/docs/manual/mod/mod_socache_memcache.html b/docs/manual/mod/mod_socache_memcache.html new file mode 100644 index 00000000000..10fd3e20260 --- /dev/null +++ b/docs/manual/mod/mod_socache_memcache.html @@ -0,0 +1,5 @@ +# GENERATED FROM XML -- DO NOT EDIT + +URI: mod_socache_memcache.html.en +Content-Language: en +Content-type: text/html; charset=ISO-8859-1 diff --git a/docs/manual/mod/mod_socache_memcache.html.en b/docs/manual/mod/mod_socache_memcache.html.en new file mode 100644 index 00000000000..92e206fddf4 --- /dev/null +++ b/docs/manual/mod/mod_socache_memcache.html.en @@ -0,0 +1,54 @@ + + + +mod_socache_memcache - Apache HTTP Server + + + + + + +

+Apache > HTTP Server > Documentation > Version 2.5 > Modules

Apache Module mod_socache_memcache

Available Languages: en

+ + + +

Description:	Memcache based shared object cache provider.
Status:	Extension
Module Identifier:	mod_socache_memcache_module
Source File:	mod_socache_memcache.c

Summary

+ +

mod_socache_memcache is a shared object cache provider + which provides for creation and access to a cache backed by the + memcached + high-performance, distributed memory object caching system. +

+ +

Details of other shared object cache providers can be found + here. +

+ +

Directives

This module provides no + directives.

+ +

Available Languages: en

+ \ No newline at end of file diff --git a/docs/manual/mod/mod_socache_memcache.xml.meta b/docs/manual/mod/mod_socache_memcache.xml.meta new file mode 100644 index 00000000000..39453809eee --- /dev/null +++ b/docs/manual/mod/mod_socache_memcache.xml.meta @@ -0,0 +1,12 @@ + + + + + mod_socache_memcache + /mod/ + .. + + + en + + diff --git a/docs/manual/mod/mod_socache_shmcb.html b/docs/manual/mod/mod_socache_shmcb.html new file mode 100644 index 00000000000..01249eb4f03 --- /dev/null +++ b/docs/manual/mod/mod_socache_shmcb.html @@ -0,0 +1,5 @@ +# GENERATED FROM XML -- DO NOT EDIT + +URI: mod_socache_shmcb.html.en +Content-Language: en +Content-type: text/html; charset=ISO-8859-1 diff --git a/docs/manual/mod/mod_socache_shmcb.html.en b/docs/manual/mod/mod_socache_shmcb.html.en new file mode 100644 index 00000000000..221d89b87ba --- /dev/null +++ b/docs/manual/mod/mod_socache_shmcb.html.en @@ -0,0 +1,57 @@ + + + +mod_socache_shmcb - Apache HTTP Server + + + + + + +

+Apache > HTTP Server > Documentation > Version 2.5 > Modules

Apache Module mod_socache_shmcb

Available Languages: en

+ + + +

Description:	shmcb based shared object cache provider.
Status:	Extension
Module Identifier:	mod_socache_shmcb_module
Source File:	mod_socache_shmcb.c

Summary

+ +

mod_socache_shmcb is a shared object cache provider + which provides for creation and access to a cache backed by a + high-performance cyclic buffer inside a shared memory segment. +

+ +

+ shmcb:/path/to/datafile(512000) +

+ +

Details of other shared object cache providers can be found + here. +

+ +

Directives

This module provides no + directives.

+ +

Available Languages: en

+ \ No newline at end of file diff --git a/docs/manual/mod/mod_socache_shmcb.xml.meta b/docs/manual/mod/mod_socache_shmcb.xml.meta new file mode 100644 index 00000000000..087e266715e --- /dev/null +++ b/docs/manual/mod/mod_socache_shmcb.xml.meta @@ -0,0 +1,12 @@ + + + + + mod_socache_shmcb + /mod/ + .. + + + en + + diff --git a/docs/manual/mod/mod_ssl.html.en b/docs/manual/mod/mod_ssl.html.en index 8d31e719c06..4ffb97b432c 100644 --- a/docs/manual/mod/mod_ssl.html.en +++ b/docs/manual/mod/mod_ssl.html.en @@ -1931,7 +1931,7 @@ The following five storage types are currently supported:

processes. This session cache may suffer reliability issues under high load.

shm:/path/to/datafile[(size)] +

shmcb:/path/to/datafile[(size)]

This makes use of a high-performance cyclic buffer (approx. size bytes in size) inside a shared memory @@ -1953,7 +1953,7 @@ The following five storage types are currently supported:

Examples

SSLSessionCache dbm:/usr/local/apache/logs/ssl_gcache_data -SSLSessionCache shm:/usr/local/apache/logs/ssl_gcache_data(512000) +SSLSessionCache shmcb:/usr/local/apache/logs/ssl_gcache_data(512000)

The ssl-cache mutex is used to serialize access to diff --git a/docs/manual/sitemap.html.en b/docs/manual/sitemap.html.en index 1f08c9243ee..c652d00c1fc 100644 --- a/docs/manual/sitemap.html.en +++ b/docs/manual/sitemap.html.en @@ -265,6 +265,10 @@ Server on HPUX

Apache Module mod_slotmem_plain

Apache Module mod_slotmem_shm

Apache Module mod_so

Apache Module mod_socache_dbm

Apache Module mod_socache_dc

Apache Module mod_socache_memcache

Apache Module mod_socache_shmcb

Apache Module mod_speling

Apache Module mod_ssl

Apache Module mod_status

diff --git a/docs/manual/socache.html.en b/docs/manual/socache.html.en index 636a0578570..31e9e85f8c6 100644 --- a/docs/manual/socache.html.en +++ b/docs/manual/socache.html.en @@ -42,20 +42,71 @@ SSLStaplingCache.

Currently available providers are:

"dbm" (mod_socache_dbm)
"dbm" (mod_socache_dbm): This makes use of a DBM hash file. The choice of underlying DBM used may be configurable if the installed APR version supports multiple DBM implementations.
"dc" (mod_socache_dc)
"dc" (mod_socache_dc): This makes use of the distcache distributed session caching libraries.
"memcache" (mod_socache_memcache)
"memcache" (mod_socache_memcache): This makes use of the memcached high-performance, distributed memory object caching system.
"shmcb" (mod_socache_shmcb)
"shmcb" (mod_socache_shmcb): This makes use of a high-performance cyclic buffer inside a shared memory segment.

+ +

The API provides the following functions:

+ +

const char *create(ap_socache_instance_t **instance, const char *arg, + apr_pool_t *tmp, apr_pool_t *p);: Create a session cache based on the given configuration string. + The instance pointer returned in the instance paramater will be + passed as the first argument to subsequent invocations.
apr_status_t init(ap_socache_instance_t *instance, const char *cname, + const struct ap_socache_hints *hints, + server_rec *s, apr_pool_t *pool): Initialize the cache. The cname must be of maximum length 16 + characters, and uniquely identifies the consumer of the cache + within the server; using the module name is recommended, e.g. + "mod_ssl-sess". This string may be used within a filesystem + path so use of only alphanumeric [a-z0-9_-] characters is + recommended. If hints is non-NULL, it gives a set of hints for + the provider. Return APR error code.
void destroy(ap_socache_instance_t *instance, server_rec *s): Destroy a given cache instance object.
apr_status_t store(ap_socache_instance_t *instance, server_rec *s, + const unsigned char *id, unsigned int idlen, + apr_time_t expiry, + unsigned char *data, unsigned int datalen, + apr_pool_t *pool): Store an object in a cache instance.
apr_status_t retrieve(ap_socache_instance_t *instance, server_rec *s, + const unsigned char *id, unsigned int idlen, + unsigned char *data, unsigned int *datalen, + apr_pool_t *pool): Retrieve a cached object.
apr_status_t remove(ap_socache_instance_t *instance, server_rec *s, + const unsigned char *id, unsigned int idlen, + apr_pool_t *pool): Remove an object from the cache.
void status(ap_socache_instance_t *instance, request_rec *r, int flags): Dump the status of a cache instance for mod_status.
apr_status_t iterate(ap_socache_instance_t *instance, server_rec *s, + void *userctx, ap_socache_iterator_t *iterator, + apr_pool_t *pool): Dump all cached objects through an iterator callback.

Available Languages: en