You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2013/04/30 22:34:37 UTC
svn commit: r1477816 [1/3] - in /httpd/httpd/branches/2.4.x/docs: man/
manual/ manual/mod/ manual/programs/
Author: minfrin
Date: Tue Apr 30 20:34:37 2013
New Revision: 1477816
URL: http://svn.apache.org/r1477816
Log:
Update transformations.
Added:
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache_socache.html
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache_socache.html.en
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache_socache.xml.meta
Modified:
httpd/httpd/branches/2.4.x/docs/man/htpasswd.1
httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml.de
httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml.es
httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml.fr
httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml.ja
httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml.ko
httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml.tr
httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml.zh-cn
httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.en
httpd/httpd/branches/2.4.x/docs/manual/mod/index.html.en
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.html.en
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.fr
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.ja
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.meta
httpd/httpd/branches/2.4.x/docs/manual/mod/quickreference.html.en
httpd/httpd/branches/2.4.x/docs/manual/programs/htpasswd.html.en
httpd/httpd/branches/2.4.x/docs/manual/programs/htpasswd.xml.ko
httpd/httpd/branches/2.4.x/docs/manual/programs/htpasswd.xml.meta
httpd/httpd/branches/2.4.x/docs/manual/programs/htpasswd.xml.tr
httpd/httpd/branches/2.4.x/docs/manual/sitemap.html.en
httpd/httpd/branches/2.4.x/docs/manual/socache.html.en
Modified: httpd/httpd/branches/2.4.x/docs/man/htpasswd.1
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/man/htpasswd.1?rev=1477816&r1=1477815&r2=1477816&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/man/htpasswd.1 (original)
+++ httpd/httpd/branches/2.4.x/docs/man/htpasswd.1 Tue Apr 30 20:34:37 2013
@@ -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
.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 htpass
-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
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml.de
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml.de?rev=1477816&r1=1477815&r2=1477816&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml.de (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml.de Tue Apr 30 20:34:37 2013
@@ -29,6 +29,7 @@
<modulefile>mod_buffer.xml</modulefile>
<modulefile>mod_cache.xml</modulefile>
<modulefile>mod_cache_disk.xml</modulefile>
+ <modulefile>mod_cache_socache.xml</modulefile>
<modulefile>mod_cern_meta.xml</modulefile>
<modulefile>mod_cgi.xml</modulefile>
<modulefile>mod_cgid.xml</modulefile>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml.es
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml.es?rev=1477816&r1=1477815&r2=1477816&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml.es (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml.es Tue Apr 30 20:34:37 2013
@@ -29,6 +29,7 @@
<modulefile>mod_buffer.xml</modulefile>
<modulefile>mod_cache.xml</modulefile>
<modulefile>mod_cache_disk.xml</modulefile>
+ <modulefile>mod_cache_socache.xml</modulefile>
<modulefile>mod_cern_meta.xml</modulefile>
<modulefile>mod_cgi.xml</modulefile>
<modulefile>mod_cgid.xml</modulefile>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml.fr?rev=1477816&r1=1477815&r2=1477816&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml.fr (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml.fr Tue Apr 30 20:34:37 2013
@@ -29,6 +29,7 @@
<modulefile>mod_buffer.xml.fr</modulefile>
<modulefile>mod_cache.xml.fr</modulefile>
<modulefile>mod_cache_disk.xml.fr</modulefile>
+ <modulefile>mod_cache_socache.xml</modulefile>
<modulefile>mod_cern_meta.xml.fr</modulefile>
<modulefile>mod_cgi.xml.fr</modulefile>
<modulefile>mod_cgid.xml.fr</modulefile>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml.ja?rev=1477816&r1=1477815&r2=1477816&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml.ja [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml.ja [utf-8] Tue Apr 30 20:34:37 2013
@@ -29,6 +29,7 @@
<modulefile>mod_buffer.xml</modulefile>
<modulefile>mod_cache.xml.ja</modulefile>
<modulefile>mod_cache_disk.xml.ja</modulefile>
+ <modulefile>mod_cache_socache.xml</modulefile>
<modulefile>mod_cern_meta.xml</modulefile>
<modulefile>mod_cgi.xml.ja</modulefile>
<modulefile>mod_cgid.xml.ja</modulefile>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml.ko?rev=1477816&r1=1477815&r2=1477816&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml.ko [euc-kr] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml.ko [euc-kr] Tue Apr 30 20:34:37 2013
@@ -29,6 +29,7 @@
<modulefile>mod_buffer.xml</modulefile>
<modulefile>mod_cache.xml.ko</modulefile>
<modulefile>mod_cache_disk.xml.ko</modulefile>
+ <modulefile>mod_cache_socache.xml</modulefile>
<modulefile>mod_cern_meta.xml.ko</modulefile>
<modulefile>mod_cgi.xml.ko</modulefile>
<modulefile>mod_cgid.xml.ko</modulefile>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml.tr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml.tr?rev=1477816&r1=1477815&r2=1477816&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml.tr [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml.tr [utf-8] Tue Apr 30 20:34:37 2013
@@ -29,6 +29,7 @@
<modulefile>mod_buffer.xml</modulefile>
<modulefile>mod_cache.xml</modulefile>
<modulefile>mod_cache_disk.xml</modulefile>
+ <modulefile>mod_cache_socache.xml</modulefile>
<modulefile>mod_cern_meta.xml</modulefile>
<modulefile>mod_cgi.xml</modulefile>
<modulefile>mod_cgid.xml</modulefile>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml.zh-cn
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml.zh-cn?rev=1477816&r1=1477815&r2=1477816&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml.zh-cn (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml.zh-cn Tue Apr 30 20:34:37 2013
@@ -29,6 +29,7 @@
<modulefile>mod_buffer.xml</modulefile>
<modulefile>mod_cache.xml</modulefile>
<modulefile>mod_cache_disk.xml</modulefile>
+ <modulefile>mod_cache_socache.xml</modulefile>
<modulefile>mod_cern_meta.xml</modulefile>
<modulefile>mod_cgi.xml</modulefile>
<modulefile>mod_cgid.xml</modulefile>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.en?rev=1477816&r1=1477815&r2=1477816&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.en Tue Apr 30 20:34:37 2013
@@ -147,6 +147,7 @@
<li><a href="mod_authz_core.html#authzprovideralias"><AuthzProviderAlias></a></li>
<li><a href="mod_authz_core.html#authzsendforbiddenonfailure">AuthzSendForbiddenOnFailure</a></li>
<li><a href="mod_proxy.html#balancergrowth" id="B" name="B">BalancerGrowth</a></li>
+<li><a href="mod_proxy.html#balancerinherit">BalancerInherit</a></li>
<li><a href="mod_proxy.html#balancermember">BalancerMember</a></li>
<li><a href="mod_proxy.html#balancerpersist">BalancerPersist</a></li>
<li><a href="mod_setenvif.html#browsermatch">BrowserMatch</a></li>
@@ -180,6 +181,12 @@
<li><a href="mod_cache_disk.html#cachereadsize">CacheReadSize</a></li>
<li><a href="mod_cache_disk.html#cachereadtime">CacheReadTime</a></li>
<li><a href="mod_cache_disk.html#cacheroot">CacheRoot</a></li>
+<li><a href="mod_cache_socache.html#cachesocache">CacheSocache</a></li>
+<li><a href="mod_cache_socache.html#cachesocachemaxsize">CacheSocacheMaxSize</a></li>
+<li><a href="mod_cache_socache.html#cachesocachemaxtime">CacheSocacheMaxTime</a></li>
+<li><a href="mod_cache_socache.html#cachesocachemintime">CacheSocacheMinTime</a></li>
+<li><a href="mod_cache_socache.html#cachesocachereadsize">CacheSocacheReadSize</a></li>
+<li><a href="mod_cache_socache.html#cachesocachereadtime">CacheSocacheReadTime</a></li>
<li><a href="mod_cache.html#cachestaleonerror">CacheStaleOnError</a></li>
<li><a href="mod_cache.html#cachestoreexpired">CacheStoreExpired</a></li>
<li><a href="mod_cache.html#cachestorenostore">CacheStoreNoStore</a></li>
@@ -412,6 +419,7 @@
<li><a href="mod_proxy.html#proxymatch"><ProxyMatch></a></li>
<li><a href="mod_proxy.html#proxymaxforwards">ProxyMaxForwards</a></li>
<li><a href="mod_proxy.html#proxypass">ProxyPass</a></li>
+<li><a href="mod_proxy.html#proxypassinherit">ProxyPassInherit</a></li>
<li><a href="mod_proxy.html#proxypassinterpolateenv">ProxyPassInterpolateEnv</a></li>
<li><a href="mod_proxy.html#proxypassmatch">ProxyPassMatch</a></li>
<li><a href="mod_proxy.html#proxypassreverse">ProxyPassReverse</a></li>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/index.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/index.html.en?rev=1477816&r1=1477815&r2=1477816&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/index.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/index.html.en Tue Apr 30 20:34:37 2013
@@ -104,6 +104,8 @@ address)</dd>
<dt><a href="mod_buffer.html" id="B" name="B">mod_buffer</a></dt><dd>Support for request buffering</dd>
<dt><a href="mod_cache.html" id="C" name="C">mod_cache</a></dt><dd>RFC 2616 compliant HTTP caching filter.</dd>
<dt><a href="mod_cache_disk.html">mod_cache_disk</a></dt><dd>Disk based storage module for the HTTP caching filter.</dd>
+<dt><a href="mod_cache_socache.html">mod_cache_socache</a></dt><dd>Shared object cache (socache) based storage module for the
+HTTP caching filter.</dd>
<dt><a href="mod_cern_meta.html">mod_cern_meta</a></dt><dd>CERN httpd metafile semantics</dd>
<dt><a href="mod_cgi.html">mod_cgi</a></dt><dd>Execution of CGI scripts</dd>
<dt><a href="mod_cgid.html">mod_cgid</a></dt><dd>Execution of CGI scripts using an
Added: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache_socache.html
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache_socache.html?rev=1477816&view=auto
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache_socache.html (added)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache_socache.html Tue Apr 30 20:34:37 2013
@@ -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
Added: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache_socache.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache_socache.html.en?rev=1477816&view=auto
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache_socache.html.en (added)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache_socache.html.en Tue Apr 30 20:34:37 2013
@@ -0,0 +1,277 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><!--
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ This file is generated from xml source: DO NOT EDIT
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ -->
+<title>mod_cache_socache - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link rel="stylesheet" type="text/css" href="../style/css/prettify.css" />
+<script src="../style/scripts/prettify.js" type="text/javascript">
+</script>
+
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.4</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs/">Documentation</a> > <a href="../">Version 2.4</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_cache_socache</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_cache_socache.html" title="English"> en </a></p>
+</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Shared object cache (socache) based storage module for the
+HTTP caching filter.</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>cache_socache_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_cache_socache.c</td></tr></table>
+<h3>Summary</h3>
+
+ <p><code class="module"><a href="../mod/mod_cache_socache.html">mod_cache_socache</a></code> implements a shared object cache
+ (socache) based storage manager for <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code>.</p>
+
+ <p>The headers and bodies of cached responses are combined, and stored
+ underneath a single key in the shared object cache. A
+ <a href="../socache.html">number of implementations</a> of shared object
+ caches are available to choose from.</p>
+
+ <p>Multiple content negotiated responses can be stored concurrently,
+ however the caching of partial content is not yet supported by this
+ module.</p>
+
+ <pre class="prettyprint lang-config">
+# 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>
+ </pre>
+
+
+ <div class="note"><h3>Note:</h3>
+ <p><code class="module"><a href="../mod/mod_cache_socache.html">mod_cache_socache</a></code> requires the services of
+ <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code>, which must be loaded before
+ mod_cache_socache.</p>
+ </div>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#cachesocache">CacheSocache</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#cachesocachemaxsize">CacheSocacheMaxSize</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#cachesocachemaxtime">CacheSocacheMaxTime</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#cachesocachemintime">CacheSocacheMinTime</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#cachesocachereadsize">CacheSocacheReadSize</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#cachesocachereadtime">CacheSocacheReadTime</a></li>
+</ul>
+<h3>See also</h3>
+<ul class="seealso">
+<li><code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code></li>
+<li><code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code></li>
+<li><a href="../caching.html">Caching Guide</a></li>
+</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
+
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheSocache" id="CacheSocache">CacheSocache</a> <a name="cachesocache" id="cachesocache">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The directory root under which cache files are
+stored</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheSocache <var>type[:args]</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache_socache</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.5 and later</td></tr>
+</table>
+ <p>The <code class="directive">CacheSocache</code> directive defines the name of
+ the shared object cache implementation to use, followed by optional
+ arguments for that implementation. A <a href="../socache.html">number of
+ implementations</a> of shared object caches are available to choose
+ from.</p>
+
+ <pre class="prettyprint lang-config">
+ CacheSocache shmcb
+ </pre>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheSocacheMaxSize" id="CacheSocacheMaxSize">CacheSocacheMaxSize</a> <a name="cachesocachemaxsize" id="cachesocachemaxsize">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The maximum size (in bytes) of an entry to be placed in the
+cache</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheSocacheMaxSize <var>bytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheSocacheMaxSize 102400</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache_socache</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.5 and later</td></tr>
+</table>
+ <p>The <code class="directive">CacheSocacheMaxSize</code> 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.</p>
+
+ <p>The <code class="module"><a href="../mod/mod_cache_socache.html">mod_cache_socache</a></code> 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
+ <code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code> module to have an opportunity to cache
+ responses larger than those cacheable within
+ <code class="module"><a href="../mod/mod_cache_socache.html">mod_cache_socache</a></code>.</p>
+
+ <pre class="prettyprint lang-config">
+ CacheSocacheMaxSize 102400
+ </pre>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheSocacheMaxTime" id="CacheSocacheMaxTime">CacheSocacheMaxTime</a> <a name="cachesocachemaxtime" id="cachesocachemaxtime">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The maximum time (in seconds) for a document to be placed in the
+cache</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheSocacheMaxTime <var>seconds</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheSocacheMaxTime 86400</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache_socache</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.5 and later</td></tr>
+</table>
+ <p>The <code class="directive">CacheSocacheMaxTime</code> 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.</p>
+
+ <pre class="prettyprint lang-config">
+ CacheSocacheMaxTime 86400
+ </pre>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheSocacheMinTime" id="CacheSocacheMinTime">CacheSocacheMinTime</a> <a name="cachesocachemintime" id="cachesocachemintime">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The maximum time (in seconds) for a document to be placed in the
+cache</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheSocacheMinTime <var>seconds</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheSocacheMinTime 600</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache_socache</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.5 and later</td></tr>
+</table>
+ <p>The <code class="directive">CacheSocacheMinTime</code> 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.</p>
+
+ <pre class="prettyprint lang-config">
+ CacheSocacheMinTime 600
+ </pre>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheSocacheReadSize" id="CacheSocacheReadSize">CacheSocacheReadSize</a> <a name="cachesocachereadsize" id="cachesocachereadsize">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The minimum size (in bytes) of the document to read and be cached
+ before sending the data downstream</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheSocacheReadSize <var>bytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheSocacheReadSize 0</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache_socache</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.5 and later</td></tr>
+</table>
+ <p>The <code class="directive">CacheSocacheReadSize</code> 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.</p>
+
+ <p>This directive only takes effect when the data is being saved to the
+ cache, as opposed to data being served from the cache.</p>
+
+ <pre class="prettyprint lang-config">
+ CacheReadSize 102400
+ </pre>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheSocacheReadTime" id="CacheSocacheReadTime">CacheSocacheReadTime</a> <a name="cachesocachereadtime" id="cachesocachereadtime">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The minimum time (in milliseconds) that should elapse while reading
+ before data is sent downstream</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheSocacheReadTime <var>milliseconds</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheSocacheReadTime 0</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache_socache</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.5 and later</td></tr>
+</table>
+ <p>The <code class="directive">CacheSocacheReadTime</code> 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.</p>
+
+ <p>The default of zero disables this option.</p>
+
+ <p>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
+ <code class="directive"><a href="#cachesocachereadsize">CacheSocacheReadSize</a></code> directive
+ to ensure that the server does not buffer excessively should data arrive faster
+ than expected.</p>
+
+ <pre class="prettyprint lang-config">
+ CacheSocacheReadTime 1000
+ </pre>
+
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_cache_socache.html" title="English"> en </a></p>
+</div><div class="top"><a href="#page-header"><img src="../images/up.gif" alt="top" /></a></div><div class="section"><h2><a id="comments_section" name="comments_section">Comments</a></h2><div class="warning"><strong>Notice:</strong><br />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 <a href="http://httpd.apache.org/lists.html">mailing lists</a>.</div>
+<script type="text/javascript"><!--//--><![CDATA[//><!--
+var comments_shortname = 'httpd';
+var comments_identifier = 'http://httpd.apache.org/docs/2.4/mod/mod_cache_socache.html';
+(function(w, d) {
+ if (w.location.hostname.toLowerCase() == "httpd.apache.org") {
+ d.write('<div id="comments_thread"><\/div>');
+ var s = d.createElement('script');
+ s.type = 'text/javascript';
+ s.async = true;
+ s.src = 'https://comments.apache.org/show_comments.lua?site=' + comments_shortname + '&page=' + comments_identifier;
+ (d.getElementsByTagName('head')[0] || d.getElementsByTagName('body')[0]).appendChild(s);
+ }
+ else {
+ d.write('<div id="comments_thread">Comments are disabled for this page at the moment.<\/div>');
+ }
+})(window, document);
+//--><!]]></script></div><div id="footer">
+<p class="apache">Copyright 2013 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div><script type="text/javascript"><!--//--><![CDATA[//><!--
+if (typeof(prettyPrint) !== 'undefined') {
+ prettyPrint();
+}
+//--><!]]></script>
+</body></html>
\ No newline at end of file
Added: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache_socache.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache_socache.xml.meta?rev=1477816&view=auto
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache_socache.xml.meta (added)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache_socache.xml.meta Tue Apr 30 20:34:37 2013
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- GENERATED FROM XML: DO NOT EDIT -->
+
+<metafile reference="mod_cache_socache.xml">
+ <basename>mod_cache_socache</basename>
+ <path>/mod/</path>
+ <relpath>..</relpath>
+
+ <variants>
+ <variant>en</variant>
+ </variants>
+</metafile>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.html.en?rev=1477816&r1=1477815&r2=1477816&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.html.en Tue Apr 30 20:34:37 2013
@@ -86,6 +86,7 @@
<div id="quickview"><h3 class="directives">Directives</h3>
<ul id="toc">
<li><img alt="" src="../images/down.gif" /> <a href="#balancergrowth">BalancerGrowth</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#balancerinherit">BalancerInherit</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#balancermember">BalancerMember</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#balancerpersist">BalancerPersist</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#noproxy">NoProxy</a></li>
@@ -99,6 +100,7 @@
<li><img alt="" src="../images/down.gif" /> <a href="#proxymatch"><ProxyMatch></a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#proxymaxforwards">ProxyMaxForwards</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#proxypass">ProxyPass</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#proxypassinherit">ProxyPassInherit</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#proxypassinterpolateenv">ProxyPassInterpolateEnv</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#proxypassmatch">ProxyPassMatch</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#proxypassreverse">ProxyPassReverse</a></li>
@@ -488,6 +490,25 @@ ProxyPass /examples http://backend.examp
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="BalancerInherit" id="BalancerInherit">BalancerInherit</a> <a name="balancerinherit" id="balancerinherit">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Inherit ProxyPassed Balancers/Workers from the main server</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>BalancerInherit On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>BalancerInherit On</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_proxy</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>BalancerInherit is only available in Apache HTTP Server 2.5.0
+ and later.</td></tr>
+</table>
+ <p>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.</p>
+ <p>The setting in the global server defines the default for all vhosts.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="BalancerMember" id="BalancerMember">BalancerMember</a> <a name="balancermember" id="balancermember">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Add a member to a load balancing group</td></tr>
@@ -1372,6 +1393,27 @@ ProxyPass / balancer://hotcluster/
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyPassInherit" id="ProxyPassInherit">ProxyPassInherit</a> <a name="proxypassinherit" id="proxypassinherit">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Inherit ProxyPass directives defined from the main server</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyPassInherit On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ProxyPassInherit On</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_proxy</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>ProxyPassInherit is only available in Apache HTTP Server 2.5.0 and later.
+ and later.</td></tr>
+</table>
+ <p>This directive will cause the current server/vhost to "inherit"
+ <code class="directive"><a href="#proxypass">ProxyPass</a></code>
+ 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.</p>
+ <p>The setting in the global server defines the default for all vhosts.</p>
+ <p>Disabling ProxyPassInherit also disables <code class="directive"><a href="#balancerinherit">BalancerInherit</a></code>.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="ProxyPassInterpolateEnv" id="ProxyPassInterpolateEnv">ProxyPassInterpolateEnv</a> <a name="proxypassinterpolateenv" id="proxypassinterpolateenv">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enable Environment Variable interpolation in Reverse Proxy configurations</td></tr>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.fr?rev=1477816&r1=1477815&r2=1477816&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.fr (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.fr Tue Apr 30 20:34:37 2013
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1476689 -->
+<!-- English Revision: 1476689:1477649 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.ja?rev=1477816&r1=1477815&r2=1477816&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.ja [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.ja [utf-8] Tue Apr 30 20:34:37 2013
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 344971:1476689 (outdated) -->
+<!-- English Revision: 344971:1477649 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.meta?rev=1477816&r1=1477815&r2=1477816&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.meta (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.meta Tue Apr 30 20:34:37 2013
@@ -8,7 +8,7 @@
<variants>
<variant>en</variant>
- <variant>fr</variant>
+ <variant outdated="yes">fr</variant>
<variant outdated="yes">ja</variant>
</variants>
</metafile>