Commit 381122a7 authored by Daniel Ruggeri's avatar Daniel Ruggeri
Browse files

Get ready to tag httpd 2.4.38 

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1851568 13f79535-47bb-0310-9956-ffa450edef68
parent 40bca111

docs/manual/mod/mod_cache.html.en

+24 −25
Original line number Original line Diff line number Diff line
@@ -199,7 +199,7 @@ LoadModule cache_module modules/mod_cache.so 
  server, a significant number of requests might arrive during this time, and

  server, a significant number of requests might arrive during this time, and

  cause a <strong>thundering herd</strong> of requests to strike the backend

  cause a <strong>thundering herd</strong> of requests to strike the backend

  suddenly and unpredictably.</p>

  suddenly and unpredictably.</p>

  <p>To keep the thundering herd at bay, the <code class="directive">CacheLock</code>

  <p>To keep the thundering herd at bay, the <code class="directive"><a href="#cachelock">CacheLock</a></code>

  directive can be used to define a directory in which locks are created for

  directive can be used to define a directory in which locks are created for

  URLs <strong>in flight</strong>. The lock is used as a <strong>hint</strong>

  URLs <strong>in flight</strong>. The lock is used as a <strong>hint</strong>

  by other requests to either suppress an attempt to cache (someone else has

  by other requests to either suppress an attempt to cache (someone else has
@@ -233,8 +233,8 @@ LoadModule cache_module modules/mod_cache.so 
    <p>As a further safety mechanism, locks have a configurable maximum age.

    <p>As a further safety mechanism, locks have a configurable maximum age.

    Once this age has been reached, the lock is removed, and a new request is

    Once this age has been reached, the lock is removed, and a new request is

    given the opportunity to create a new lock. This maximum age can be set using

    given the opportunity to create a new lock. This maximum age can be set using

    the <code class="directive">CacheLockMaxAge</code> directive, and defaults to 5

    the <code class="directive"><a href="#cachelockmaxage">CacheLockMaxAge</a></code> directive, and defaults

    seconds.

    to 5 seconds.

    </p>

    </p>

  

  

  <h3>Example configuration</h3>

  <h3>Example configuration</h3>
@@ -263,14 +263,14 @@ LoadModule cache_module modules/mod_cache.so 
  <p>While this mode offers the best performance, the administrator may find that

  <p>While this mode offers the best performance, the administrator may find that

  under certain circumstances they may want to perform further processing on the

  under certain circumstances they may want to perform further processing on the

  request after the request is cached, such as to inject personalisation into the

  request after the request is cached, such as to inject personalisation into the

  cached page, or to apply authorisation restrictions to the content. Under these

  cached page, or to apply authorization restrictions to the content. Under these

  circumstances, an administrator is often forced to place independent reverse

  circumstances, an administrator is often forced to place independent reverse

  proxy servers either behind or in front of the caching server to achieve this.</p>

  proxy servers either behind or in front of the caching server to achieve this.</p>





  <p>To solve this problem the <code class="directive"><a href="#cachequickhandler">CacheQuickHandler

  <p>To solve this problem the <code class="directive"><a href="#cachequickhandler">CacheQuickHandler</a></code>

  </a></code> directive can be set to <strong>off</strong>, and the server will

  directive can be set to <strong>off</strong>, and the server will

  process all phases normally handled by a non-cached request, including the

  process all phases normally handled by a non-cached request, including the

  <strong>authentication and authorisation</strong> phases.</p>

  <strong>authentication and authorization</strong> phases.</p>





  <p>In addition, the administrator may optionally specify the <strong>precise point

  <p>In addition, the administrator may optionally specify the <strong>precise point

  within the filter chain</strong> where caching is to take place by adding the

  within the filter chain</strong> where caching is to take place by adding the
@@ -361,7 +361,7 @@ CustomLog "invalidated-requests.log" common env=cache-invalidate</pre> 
</table>

</table>

    <p>The <code class="directive">CacheDefaultExpire</code> directive specifies a default time,

    <p>The <code class="directive">CacheDefaultExpire</code> directive specifies a default time,

    in seconds, to cache a document if neither an expiry date nor last-modified date are provided

    in seconds, to cache a document if neither an expiry date nor last-modified date are provided

    with the document. The value specified with the <code class="directive">CacheMaxExpire</code>

    with the document. The value specified with the <code class="directive"><a href="#cachemaxexpire">CacheMaxExpire</a></code>

    directive does <em>not</em> override this setting.</p>

    directive does <em>not</em> override this setting.</p>





    <pre class="prettyprint lang-config">CacheDefaultExpire 86400</pre>

    <pre class="prettyprint lang-config">CacheDefaultExpire 86400</pre>
@@ -379,7 +379,7 @@ CustomLog "invalidated-requests.log" common env=cache-invalidate</pre> 
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache</td></tr>

<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache</td></tr>

<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.3.9 and later</td></tr>

<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.3.9 and later</td></tr>

</table>

</table>

  <p>When the <code class="directive"><a href="#cachedetailheader">CacheDetailHeader</a></code> directive

  <p>When the <code class="directive">CacheDetailHeader</code> directive

  is switched on, an <strong>X-Cache-Detail</strong> header will be added to the response

  is switched on, an <strong>X-Cache-Detail</strong> header will be added to the response

  containing the detailed reason for a particular caching decision.</p>

  containing the detailed reason for a particular caching decision.</p>
@@ -420,7 +420,7 @@ CacheDetailHeader on</pre> 
    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">CacheDisable "/local_files"</pre>

    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">CacheDisable "/local_files"</pre>

</div>

</div>





    <p>If used in a <code class="directive">&lt;Location&gt;</code> directive,

    <p>If used in a <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> directive,

    the path needs to be specified below the Location, or if the word "on"

    the path needs to be specified below the Location, or if the word "on"

    is used, caching for the whole location will be disabled.</p>

    is used, caching for the whole location will be disabled.</p>
@@ -456,8 +456,8 @@ manager</td></tr> 
    <var>url-string</var>. The cache storage manager is specified with the

    <var>url-string</var>. The cache storage manager is specified with the

    <var>cache_type</var> argument. The <code class="directive">CacheEnable</code>

    <var>cache_type</var> argument. The <code class="directive">CacheEnable</code>

    directive can alternatively be placed inside either

    directive can alternatively be placed inside either

    <code class="directive">&lt;Location&gt;</code> or

    <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> or

    <code class="directive">&lt;LocationMatch&gt;</code> sections to indicate

    <code class="directive"><a href="../mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code> sections to indicate

    the content is cacheable.

    the content is cacheable.

    <var>cache_type</var> <code>disk</code> instructs

    <var>cache_type</var> <code>disk</code> instructs

    <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> to use the disk based storage manager

    <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> to use the disk based storage manager
@@ -471,8 +471,8 @@ manager</td></tr> 
    actually processes the request. The order in which the storage managers are

    actually processes the request. The order in which the storage managers are

    run is determined by the order of the <code class="directive">CacheEnable</code>

    run is determined by the order of the <code class="directive">CacheEnable</code>

    directives in the configuration file. <code class="directive">CacheEnable</code>

    directives in the configuration file. <code class="directive">CacheEnable</code>

    directives within <code class="directive">&lt;Location&gt;</code> or

    directives within <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> or

    <code class="directive">&lt;LocationMatch&gt;</code> sections are processed

    <code class="directive"><a href="../mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code> sections are processed

    before globally defined <code class="directive">CacheEnable</code> directives.</p>

    before globally defined <code class="directive">CacheEnable</code> directives.</p>





    <p>When acting as a forward proxy server, <var>url-string</var> must

    <p>When acting as a forward proxy server, <var>url-string</var> must
@@ -531,7 +531,7 @@ CacheEnable disk "http://.example.org/"</pre> 
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache</td></tr>

<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache</td></tr>

<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.3.9 and later</td></tr>

<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.3.9 and later</td></tr>

</table>

</table>

  <p>When the <code class="directive"><a href="#cacheheader">CacheHeader</a></code> directive

  <p>When the <code class="directive">CacheHeader</code> directive

  is switched on, an <strong>X-Cache</strong> header will be added to the response

  is switched on, an <strong>X-Cache</strong> header will be added to the response

  with the cache status of this response. If the normal handler is used, this

  with the cache status of this response. If the normal handler is used, this

  directive may appear within a <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>

  directive may appear within a <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>
@@ -567,7 +567,7 @@ CacheHeader on</pre> 
<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</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</td></tr>

<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache</td></tr>

</table>

</table>

    <p>Ordinarily, requests containing a Cache-Control: no-cache or

    <p>Ordinarily, requests containing a <code>Cache-Control: no-cache</code> or

    Pragma: no-cache header value will not be served from the cache.  The

    Pragma: no-cache header value will not be served from the cache.  The

    <code class="directive">CacheIgnoreCacheControl</code> directive allows this

    <code class="directive">CacheIgnoreCacheControl</code> directive allows this

    behavior to be overridden.  <code class="directive">CacheIgnoreCacheControl On</code>

    behavior to be overridden.  <code class="directive">CacheIgnoreCacheControl On</code>
@@ -660,7 +660,7 @@ header.</td></tr> 
    should be considered for caching, even without a last-modified date.

    should be considered for caching, even without a last-modified date.

    If neither a last-modified date nor an expiry date are provided with

    If neither a last-modified date nor an expiry date are provided with

    the document then the value specified by the

    the document then the value specified by the

    <code class="directive">CacheDefaultExpire</code> directive will be used to

    <code class="directive"><a href="#cachedefaultexpire">CacheDefaultExpire</a></code> directive will be used to

    generate an expiration date.</p>

    generate an expiration date.</p>





    <pre class="prettyprint lang-config">CacheIgnoreNoLastMod On</pre>

    <pre class="prettyprint lang-config">CacheIgnoreNoLastMod On</pre>
@@ -731,13 +731,12 @@ header.</td></tr> 
<table class="directive">

<table class="directive">

<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Override the base URL of reverse proxied cache keys.</td></tr>

<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Override the base URL of reverse proxied cache keys.</td></tr>

<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheKeyBaseURL <var>URL</var></code></td></tr>

<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheKeyBaseURL <var>URL</var></code></td></tr>

<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheKeyBaseURL http://example.com</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#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#Status">Status:</a></th><td>Extension</td></tr>

<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache</td></tr>

<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache</td></tr>

<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.3.9 and later</td></tr>

<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.3.9 and later</td></tr>

</table>

</table>

  <p>When the <code class="directive"><a href="#cachekeybaseurl">CacheKeyBaseURL</a></code> directive

  <p>When the <code class="directive">CacheKeyBaseURL</code> directive

  is specified, the URL provided will be used as the base URL to calculate

  is specified, the URL provided will be used as the base URL to calculate

  the URL of the cache keys in the reverse proxy configuration. When not specified,

  the URL of the cache keys in the reverse proxy configuration. When not specified,

  the scheme, hostname and port of the current virtual host is used to construct

  the scheme, hostname and port of the current virtual host is used to construct
@@ -782,7 +781,7 @@ LastModified date.</td></tr> 
    expiry-date would be 3:00pm + 1hour = 4:00pm.

    expiry-date would be 3:00pm + 1hour = 4:00pm.





    If the expiry-period would be longer than that set by

    If the expiry-period would be longer than that set by

    <code class="directive">CacheMaxExpire</code>, then the latter takes

    <code class="directive"><a href="#cachemaxexpire">CacheMaxExpire</a></code>, then the latter takes

    precedence.</p>

    precedence.</p>





    <pre class="prettyprint lang-config">CacheLastModifiedFactor 0.5</pre>

    <pre class="prettyprint lang-config">CacheLastModifiedFactor 0.5</pre>
@@ -899,7 +898,7 @@ CacheLock on</pre> 
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache</td></tr>

<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache</td></tr>

<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Apache HTTP Server 2.3.3 and later</td></tr>

<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Apache HTTP Server 2.3.3 and later</td></tr>

</table>

</table>

    <p>The <code class="directive"><a href="#cachequickhandler">CacheQuickHandler</a></code> directive

    <p>The <code class="directive">CacheQuickHandler</code> directive

    controls the phase in which the cache is handled.</p>

    controls the phase in which the cache is handled.</p>





    <p>In the default enabled configuration, the cache operates within the quick

    <p>In the default enabled configuration, the cache operates within the quick
@@ -911,7 +910,7 @@ CacheLock on</pre> 
    <p>When disabled, the cache operates as a normal handler, and is subject to

    <p>When disabled, the cache operates as a normal handler, and is subject to

    the full set of phases when handling a server request. While this mode is

    the full set of phases when handling a server request. While this mode is

    slower than the default, it allows the cache to be used in cases where full

    slower than the default, it allows the cache to be used in cases where full

    processing is required, such as when content is subject to authorisation.</p>

    processing is required, such as when content is subject to authorization.</p>





    <pre class="prettyprint lang-config"># Run cache as a normal handler

    <pre class="prettyprint lang-config"># Run cache as a normal handler

CacheQuickHandler off</pre>

CacheQuickHandler off</pre>
@@ -943,7 +942,7 @@ AddOutputFilterByType CACHE;INCLUDES;DEFLATE text/html</pre> 
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache</td></tr>

<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache</td></tr>

<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.3.9 and later</td></tr>

<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.3.9 and later</td></tr>

</table>

</table>

  <p>When the <code class="directive"><a href="#cachestaleonerror">CacheStaleOnError</a></code> directive

  <p>When the <code class="directive">CacheStaleOnError</code> directive

  is switched on, and when stale data is available in the cache, the cache will

  is switched on, and when stale data is available in the cache, the cache will

  respond to 5xx responses from the backend by returning the stale data instead of

  respond to 5xx responses from the backend by returning the stale data instead of

  the 5xx response. While the Cache-Control headers sent by clients will be respected,

  the 5xx response. While the Cache-Control headers sent by clients will be respected,
@@ -989,7 +988,7 @@ CacheStaleOnError on</pre> 
<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</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</td></tr>

<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache</td></tr>

</table>

</table>

    <p>Ordinarily, requests or responses with Cache-Control: no-store header

    <p>Ordinarily, requests or responses with <code>Cache-Control: no-store</code> header

       values will not be stored in the cache.  The

       values will not be stored in the cache.  The

       <code class="directive">CacheStoreNoStore</code> directive allows this

       <code class="directive">CacheStoreNoStore</code> directive allows this

       behavior to be overridden.  <code class="directive">CacheStoreNoStore</code> On

       behavior to be overridden.  <code class="directive">CacheStoreNoStore</code> On
@@ -1023,7 +1022,7 @@ CacheStaleOnError on</pre> 
<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</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</td></tr>

<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache</td></tr>

</table>

</table>

    <p>Ordinarily, responses with Cache-Control: private header values will not

    <p>Ordinarily, responses with <code>Cache-Control: private</code> header values will not

       be stored in the cache.  The <code class="directive">CacheStorePrivate</code>

       be stored in the cache.  The <code class="directive">CacheStorePrivate</code>

       directive allows this behavior to be overridden.

       directive allows this behavior to be overridden.

       <code class="directive">CacheStorePrivate</code> On

       <code class="directive">CacheStorePrivate</code> On

docs/manual/mod/mod_cache.html.ja.utf8

+0 −1
Original line number Original line Diff line number Diff line
@@ -420,7 +420,6 @@ 
<table class="directive">

<table class="directive">

<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>Override the base URL of reverse proxied cache keys.</td></tr>

<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>Override the base URL of reverse proxied cache keys.</td></tr>

<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>CacheKeyBaseURL <var>URL</var></code></td></tr>

<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>CacheKeyBaseURL <var>URL</var></code></td></tr>

<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>CacheKeyBaseURL http://example.com</code></td></tr>

<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト</td></tr>

<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト</td></tr>

<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>

<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>

<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_cache</td></tr>

<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_cache</td></tr>

docs/manual/mod/mod_lua.html.fr.utf8

+2 −0
Original line number Original line Diff line number Diff line
@@ -29,6 +29,8 @@ 
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_lua.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |

<p><span>Langues Disponibles: </span><a href="../en/mod/mod_lua.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |

<a href="../fr/mod/mod_lua.html" title="Français">&nbsp;fr&nbsp;</a></p>

<a href="../fr/mod/mod_lua.html" title="Français">&nbsp;fr&nbsp;</a></p>

</div>

</div>

<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version

            anglaise pour les changements récents.</div>

<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Fournit des points d'entrée Lua dans différentes parties du

<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Fournit des points d'entrée Lua dans différentes parties du

traitement des requêtes httpd</td></tr>

traitement des requêtes httpd</td></tr>

<tr><th><a href="module-dict.html#Status">Statut:</a></th><td>Expérimental</td></tr>

<tr><th><a href="module-dict.html#Status">Statut:</a></th><td>Expérimental</td></tr>

docs/manual/mod/mod_lua.xml.fr

+1 −1
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" ?>

<?xml version="1.0" encoding="UTF-8" ?>

<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">

<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">

<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>

<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>

<!-- English Revision: 1837405 -->

<!-- English Revision: 1837405:1851341 (outdated) -->

<!-- French translation : Lucien GENTIS -->

<!-- French translation : Lucien GENTIS -->

<!-- Reviewed by : Vincent Deffontaines -->

<!-- Reviewed by : Vincent Deffontaines -->

docs/manual/mod/mod_lua.xml.meta

+1 −1
Original line number Original line Diff line number Diff line
@@ -8,6 +8,6 @@ 




  <variants>

  <variants>

    <variant>en</variant>

    <variant>en</variant>

    <variant>fr</variant>

    <variant outdated="yes">fr</variant>

  </variants>

  </variants>

</metafile>
 
</metafile>