From a6f537dec78874754ed8961dcb51ba716c0a8258 Mon Sep 17 00:00:00 2001 From: Graham Leggett Date: Tue, 30 Apr 2013 20:34:37 +0000 Subject: [PATCH] Update transformations. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1477816 13f79535-47bb-0310-9956-ffa450edef68 --- docs/man/htpasswd.1 | 9 +- docs/manual/mod/allmodules.xml.de | 1 + docs/manual/mod/allmodules.xml.es | 1 + docs/manual/mod/allmodules.xml.fr | 1 + docs/manual/mod/allmodules.xml.ja | 1 + docs/manual/mod/allmodules.xml.ko | 1 + docs/manual/mod/allmodules.xml.tr | 1 + docs/manual/mod/allmodules.xml.zh-cn | 1 + docs/manual/mod/directives.html.en | 8 + docs/manual/mod/index.html.en | 2 + docs/manual/mod/mod_cache_socache.html | 5 + docs/manual/mod/mod_cache_socache.html.en | 277 ++++++++++ docs/manual/mod/mod_cache_socache.xml.meta | 12 + docs/manual/mod/mod_proxy.html.en | 42 ++ docs/manual/mod/mod_proxy.xml.fr | 2 +- docs/manual/mod/mod_proxy.xml.ja | 2 +- docs/manual/mod/mod_proxy.xml.meta | 2 +- docs/manual/mod/quickreference.html.en | 614 +++++++++++---------- docs/manual/programs/htpasswd.html.en | 10 +- docs/manual/programs/htpasswd.xml.ko | 2 +- docs/manual/programs/htpasswd.xml.meta | 2 +- docs/manual/programs/htpasswd.xml.tr | 2 +- docs/manual/sitemap.html.en | 1 + docs/manual/socache.html.en | 1 + 24 files changed, 689 insertions(+), 311 deletions(-) create mode 100644 docs/manual/mod/mod_cache_socache.html create mode 100644 docs/manual/mod/mod_cache_socache.html.en create mode 100644 docs/manual/mod/mod_cache_socache.xml.meta diff --git a/docs/man/htpasswd.1 b/docs/man/htpasswd.1 index 07fc3a50c4..9ff3a6f464 100644 --- a/docs/man/htpasswd.1 +++ b/docs/man/htpasswd.1 @@ -19,7 +19,7 @@ .el .ne 3 .IP "\\$1" \\$2 .. -.TH "HTPASSWD" 1 "2012-12-12" "Apache HTTP Server" "htpasswd" +.TH "HTPASSWD" 1 "2013-04-30" "Apache HTTP Server" "htpasswd" .SH NAME htpasswd \- Manage user files for basic authentication @@ -27,10 +27,10 @@ htpasswd \- Manage user files for basic authentication .SH "SYNOPSIS" .PP -\fBhtpasswd\fR [ -\fBc\fR ] [ -\fBi\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBD\fR ] \fIpasswdfile\fR \fIusername\fR +\fBhtpasswd\fR [ -\fBc\fR ] [ -\fBi\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBD\fR ] [ -\fBv\fR ] \fIpasswdfile\fR \fIusername\fR .PP -\fBhtpasswd\fR -\fBb\fR [ -\fBc\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBD\fR ] \fIpasswdfile\fR \fIusername\fR \fIpassword\fR +\fBhtpasswd\fR -\fBb\fR [ -\fBc\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBD\fR ] [ -\fBv\fR ] \fIpasswdfile\fR \fIusername\fR \fIpassword\fR .PP \fBhtpasswd\fR -\fBn\fR [ -\fBi\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] \fIusername\fR @@ -91,6 +91,9 @@ Use plaintext passwords\&. Though htpasswd will support creation on all platform -D Delete user\&. If the username exists in the specified htpasswd file, it will be deleted\&. .TP +-v +Verify password\&. Verify that the given password matches the password of the user stored in the specified htpasswd file\&. +.TP \fIpasswdfile\fR Name of the file to contain the user name and password\&. If -c is given, this file is created if it does not already exist, or rewritten and truncated if it does exist\&. .TP diff --git a/docs/manual/mod/allmodules.xml.de b/docs/manual/mod/allmodules.xml.de index 9f3920a090..10a15e46a7 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 e6879c3b8a..95984101d5 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 c1eaaeb3f5..99c104e785 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.fr mod_cgi.xml.fr mod_cgid.xml.fr diff --git a/docs/manual/mod/allmodules.xml.ja b/docs/manual/mod/allmodules.xml.ja index 35fe5102a6..6a43fbda05 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 09180aa229..2936b24c4a 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 8e5451558b..a892e56e7a 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 31af9e6f29..b1c409b089 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/directives.html.en b/docs/manual/mod/directives.html.en index 921e5c3814..10b8d41973 100644 --- a/docs/manual/mod/directives.html.en +++ b/docs/manual/mod/directives.html.en @@ -147,6 +147,7 @@
  • <AuthzProviderAlias>
  • AuthzSendForbiddenOnFailure
  • BalancerGrowth
  • +
  • BalancerInherit
  • BalancerMember
  • BalancerPersist
  • BrowserMatch
  • @@ -180,6 +181,12 @@
  • CacheReadSize
  • CacheReadTime
  • CacheRoot
  • +
  • CacheSocache
  • +
  • CacheSocacheMaxSize
  • +
  • CacheSocacheMaxTime
  • +
  • CacheSocacheMinTime
  • +
  • CacheSocacheReadSize
  • +
  • CacheSocacheReadTime
  • CacheStaleOnError
  • CacheStoreExpired
  • CacheStoreNoStore
  • @@ -412,6 +419,7 @@
  • <ProxyMatch>
  • ProxyMaxForwards
  • ProxyPass
  • +
  • ProxyPassInherit
  • ProxyPassInterpolateEnv
  • ProxyPassMatch
  • ProxyPassReverse
  • diff --git a/docs/manual/mod/index.html.en b/docs/manual/mod/index.html.en index 1a10be9156..b149677dff 100644 --- a/docs/manual/mod/index.html.en +++ b/docs/manual/mod/index.html.en @@ -104,6 +104,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_cache_socache.html b/docs/manual/mod/mod_cache_socache.html new file mode 100644 index 0000000000..9294ba717f --- /dev/null +++ b/docs/manual/mod/mod_cache_socache.html @@ -0,0 +1,5 @@ +# GENERATED FROM XML -- DO NOT EDIT + +URI: mod_cache_socache.html.en +Content-Language: en +Content-type: text/html; charset=ISO-8859-1 diff --git a/docs/manual/mod/mod_cache_socache.html.en b/docs/manual/mod/mod_cache_socache.html.en new file mode 100644 index 0000000000..8638254935 --- /dev/null +++ b/docs/manual/mod/mod_cache_socache.html.en @@ -0,0 +1,277 @@ + + + +mod_cache_socache - Apache HTTP Server + + + + + + + + +
    <-
    + +
    +

    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 

    +
    top

    Comments

    Notice:
    This is not a Q&A section. Comments placed here should be pointed towards suggestions on improving the documentation or server, and may be removed again by our moderators if they are either implemented or considered invalid/off-topic. Questions on how to manage the Apache HTTP Server should be directed at either our IRC channel, #httpd, on Freenode, or sent to our mailing lists.
    +
    + \ No newline at end of file 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_proxy.html.en b/docs/manual/mod/mod_proxy.html.en index 4af6ac74b9..5a66b13d97 100644 --- a/docs/manual/mod/mod_proxy.html.en +++ b/docs/manual/mod/mod_proxy.html.en @@ -86,6 +86,7 @@

    Directives

    +
    top
    +

    BalancerInherit Directive

    + + + + + + + + +
    Description:Inherit ProxyPassed Balancers/Workers from the main server
    Syntax:BalancerInherit On|Off
    Default:BalancerInherit On
    Context:server config, virtual host
    Status:Extension
    Module:mod_proxy
    Compatibility:BalancerInherit is only available in Apache HTTP Server 2.5.0 + and later.
    +

    This directive will cause the current server/vhost to "inherit" ProxyPass + Balancers and Workers defined in the main server. This can cause issues and + inconsistent behavior if using the Balancer Manager and so should be disabled + if using that feature.

    +

    The setting in the global server defines the default for all vhosts.

    +
    top

    BalancerMember Directive

    @@ -1370,6 +1391,27 @@ ProxyPass / balancer://hotcluster/ [P] flag.

    +
    +
    top
    +

    ProxyPassInherit Directive

    + + + + + + + + +
    Description:Inherit ProxyPass directives defined from the main server
    Syntax:ProxyPassInherit On|Off
    Default:ProxyPassInherit On
    Context:server config, virtual host
    Status:Extension
    Module:mod_proxy
    Compatibility:ProxyPassInherit is only available in Apache HTTP Server 2.5.0 and later. + and later.
    +

    This directive will cause the current server/vhost to "inherit" + ProxyPass + directives defined in the main server. This can cause issues and + inconsistent behavior if using the Balancer Manager for dynamic changes + and so should be disabled if using that feature.

    +

    The setting in the global server defines the default for all vhosts.

    +

    Disabling ProxyPassInherit also disables BalancerInherit.

    +
    top

    ProxyPassInterpolateEnv Directive

    diff --git a/docs/manual/mod/mod_proxy.xml.fr b/docs/manual/mod/mod_proxy.xml.fr index e489abffe7..e29488b8eb 100644 --- a/docs/manual/mod/mod_proxy.xml.fr +++ b/docs/manual/mod/mod_proxy.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/mod/mod_proxy.xml.ja b/docs/manual/mod/mod_proxy.xml.ja index d4cb70b541..fc85c3d468 100644 --- a/docs/manual/mod/mod_proxy.xml.ja +++ b/docs/manual/mod/mod_proxy.xml.ja @@ -1,7 +1,7 @@ - + + +