httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r1619885 [1/10] - in /httpd/httpd/branches/2.4.x: ./ docs/manual/mod/ docs/manual/programs/ docs/manual/vhosts/
Date Fri, 22 Aug 2014 18:18:55 GMT
Author: wrowe
Date: Fri Aug 22 18:18:54 2014
New Revision: 1619885

URL: http://svn.apache.org/r1619885
Log:
Sync docs to r1619884

Modified:
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.de
    httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.en
    httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.es
    httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.fr
    httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.ja.utf8
    httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.tr.utf8
    httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.de
    httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.en
    httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.es
    httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.fr
    httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.ja.utf8
    httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.ko.euc-kr
    httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.tr.utf8
    httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.zh-cn.utf8
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_log_config.html.en
    httpd/httpd/branches/2.4.x/docs/manual/mod/quickreference.html.de
    httpd/httpd/branches/2.4.x/docs/manual/mod/quickreference.html.en
    httpd/httpd/branches/2.4.x/docs/manual/mod/quickreference.html.es
    httpd/httpd/branches/2.4.x/docs/manual/mod/quickreference.html.fr
    httpd/httpd/branches/2.4.x/docs/manual/mod/quickreference.html.ja.utf8
    httpd/httpd/branches/2.4.x/docs/manual/mod/quickreference.html.ko.euc-kr
    httpd/httpd/branches/2.4.x/docs/manual/mod/quickreference.html.tr.utf8
    httpd/httpd/branches/2.4.x/docs/manual/mod/quickreference.html.zh-cn.utf8
    httpd/httpd/branches/2.4.x/docs/manual/programs/rotatelogs.html.tr.utf8
    httpd/httpd/branches/2.4.x/docs/manual/vhosts/name-based.html.fr
    httpd/httpd/branches/2.4.x/docs/manual/vhosts/name-based.html.tr.utf8
    httpd/httpd/branches/2.4.x/docs/manual/vhosts/name-based.xml.de
    httpd/httpd/branches/2.4.x/docs/manual/vhosts/name-based.xml.fr
    httpd/httpd/branches/2.4.x/docs/manual/vhosts/name-based.xml.ja
    httpd/httpd/branches/2.4.x/docs/manual/vhosts/name-based.xml.ko
    httpd/httpd/branches/2.4.x/docs/manual/vhosts/name-based.xml.meta
    httpd/httpd/branches/2.4.x/docs/manual/vhosts/name-based.xml.tr

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1619885&r1=1619884&r2=1619885&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Fri Aug 22 18:18:54 2014
@@ -101,16 +101,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) SECURITY: CVE-2013-5704 (cve.mitre.org)
-     core: HTTP trailers could be used to replace HTTP headers
-     late during request processing, potentially undoing or
-     otherwise confusing modules that examined or modified
-     request headers earlier.  Adds "MergeTrailers" directive to restore
-     legacy behavior.  [Edward Lu, Yann Ylavic, Joe Orton, Eric Covener]
-
-     trunk patch: http://svn.apache.org/r1610814
-     2.4.x patch: http://people.apache.org/~covener/patches/httpd-2.4.x-trailers.diff
-     +1: covener, wrowe, ylavic
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.de
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.de?rev=1619885&r1=1619884&r2=1619885&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.de (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.de Fri Aug 22 18:18:54 2014
@@ -92,6 +92,7 @@ Servers</td></tr>
 <li><img alt="" src="../images/down.gif" /> <a href="#maxrangeoverlaps">MaxRangeOverlaps</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#maxrangereversals">MaxRangeReversals</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#maxranges">MaxRanges</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#mergetrailers">MergeTrailers</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#mutex">Mutex</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#namevirtualhost">NameVirtualHost</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#options">Options</a></li>
@@ -2432,6 +2433,19 @@ resource </td></tr>
             noch nicht übersetzt. Bitte schauen Sie in die englische
             Version.</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="MergeTrailers" id="MergeTrailers">MergeTrailers</a>-<a
name="mergetrailers" id="mergetrailers">Direktive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Beschreibung:</a></th><td>Determins
whether trailers are merged into headers</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>MergeTrailers
[on|off]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Voreinstellung:</a></th><td><code>MergeTrailers
off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Kontext:</a></th><td>Serverkonfiguration,
Virtual Host</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modul:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Kompatibilität:</a></th><td>2.4.10
and later</td></tr>
+</table><p>Die Dokumentation zu dieser Direktive wurde
+            noch nicht übersetzt. Bitte schauen Sie in die englische
+            Version.</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="Mutex" id="Mutex">Mutex</a>-<a
name="mutex" id="mutex">Direktive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Beschreibung:</a></th><td>Configures
mutex mechanism and lock file directory for all

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.en?rev=1619885&r1=1619884&r2=1619885&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.en Fri Aug 22 18:18:54 2014
@@ -89,6 +89,7 @@ available</td></tr>
 <li><img alt="" src="../images/down.gif" /> <a href="#maxrangeoverlaps">MaxRangeOverlaps</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#maxrangereversals">MaxRangeReversals</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#maxranges">MaxRanges</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#mergetrailers">MergeTrailers</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#mutex">Mutex</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#namevirtualhost">NameVirtualHost</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#options">Options</a></li>
@@ -3046,6 +3047,25 @@ resource </td></tr>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"
/></a></div>
+<div class="directive-section"><h2><a name="MergeTrailers" id="MergeTrailers">MergeTrailers</a>
<a name="mergetrailers" id="mergetrailers">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Determins
whether trailers are merged into headers</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>MergeTrailers
[on|off]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>MergeTrailers
off</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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>2.4.10
and later</td></tr>
+</table>
+    <p>This directive controls whether HTTP trailers are copied into the
+    internal representation of HTTP headers. This mergeing occurs when the 
+    request body has been completely consumed, long after most header 
+    processing would have a chance to examine or modify request headers.</p>
+    <p>This option is provided for compatibility with releases prior to 2.4.10,
+    where trailers were always merged.</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="Mutex" id="Mutex">Mutex</a>
<a name="mutex" id="mutex">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configures
mutex mechanism and lock file directory for all

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.es
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.es?rev=1619885&r1=1619884&r2=1619885&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.es (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.es Fri Aug 22 18:18:54 2014
@@ -92,6 +92,7 @@
 <li><img alt="" src="../images/down.gif" /> <a href="#maxrangeoverlaps">MaxRangeOverlaps</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#maxrangereversals">MaxRangeReversals</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#maxranges">MaxRanges</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#mergetrailers">MergeTrailers</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#mutex">Mutex</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#namevirtualhost">NameVirtualHost</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#options">Options</a></li>
@@ -2830,6 +2831,19 @@ resource </td></tr>
             not been translated yet. Please have a look at the English
             version.</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="MergeTrailers" id="MergeTrailers">MergeTrailers</a>
<a name="mergetrailers" id="mergetrailers">Directiva</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Descripción:</a></th><td>Determins
whether trailers are merged into headers</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sintaxis:</a></th><td><code>MergeTrailers
[on|off]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Valor por defecto:</a></th><td><code>MergeTrailers
off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexto:</a></th><td>server
config, virtual host</td></tr>
+<tr><th><a href="directive-dict.html#Status">Estado:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Módulo:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibilidad:</a></th><td>2.4.10
and later</td></tr>
+</table><p>The documentation for this directive has
+            not been translated yet. Please have a look at the English
+            version.</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="Mutex" id="Mutex">Mutex</a>
<a name="mutex" id="mutex">Directiva</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Descripción:</a></th><td>Configures
mutex mechanism and lock file directory for all

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.fr?rev=1619885&r1=1619884&r2=1619885&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.fr (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.fr Fri Aug 22 18:18:54 2014
@@ -89,6 +89,7 @@ disponibles</td></tr>
 <li><img alt="" src="../images/down.gif" /> <a href="#maxrangeoverlaps">MaxRangeOverlaps</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#maxrangereversals">MaxRangeReversals</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#maxranges">MaxRanges</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#mergetrailers">MergeTrailers</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#mutex">Mutex</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#namevirtualhost">NameVirtualHost</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#options">Options</a></li>
@@ -3258,6 +3259,19 @@ Apache</td></tr>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"
/></a></div>
+<div class="directive-section"><h2><a name="MergeTrailers" id="MergeTrailers">MergeTrailers</a>
<a name="mergetrailers" id="mergetrailers">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Determins
whether trailers are merged into headers</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>MergeTrailers
[on|off]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Défaut:</a></th><td><code>MergeTrailers
off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration
du serveur, serveur virtuel</td></tr>
+<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibilité:</a></th><td>2.4.10
and later</td></tr>
+</table><p>La documentation de cette directive
+	n'a pas encore t traduite. Veuillez vous reporter  la version
+	en langue anglaise.</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="Mutex" id="Mutex">Mutex</a>
<a name="mutex" id="mutex">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Définit
les mécanismes de mutex et le repertoire du fichier

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.ja.utf8
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.ja.utf8?rev=1619885&r1=1619884&r2=1619885&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.ja.utf8 [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.ja.utf8 [utf-8] Fri Aug 22 18:18:54
2014
@@ -92,6 +92,7 @@
 <li><img alt="" src="../images/down.gif" /> <a href="#maxrangeoverlaps">MaxRangeOverlaps</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#maxrangereversals">MaxRangeReversals</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#maxranges">MaxRanges</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#mergetrailers">MergeTrailers</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#mutex">Mutex</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#namevirtualhost">NameVirtualHost</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#options">Options</a></li>
@@ -2373,6 +2374,19 @@ resource </td></tr>
             まだ翻訳されていません。英語版をご覧ください。
             </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="MergeTrailers" id="MergeTrailers">MergeTrailers</a>
<a name="mergetrailers" id="mergetrailers">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>Determins
whether trailers are merged into headers</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>MergeTrailers
[on|off]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>MergeTrailers
off</code></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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互換性:</a></th><td>2.4.10
and later</td></tr>
+</table><p>このディレクティブの解説文書は
+            まだ翻訳されていません。英語版をご覧ください。
+            </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="Mutex" id="Mutex">Mutex</a>
<a name="mutex" id="mutex">ディレクティブ</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">説明:</a></th><td>Configures
mutex mechanism and lock file directory for all

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.tr.utf8
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.tr.utf8?rev=1619885&r1=1619884&r2=1619885&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.tr.utf8 [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.tr.utf8 [utf-8] Fri Aug 22 18:18:54
2014
@@ -89,6 +89,7 @@
 <li><img alt="" src="../images/down.gif" /> <a href="#maxrangeoverlaps">MaxRangeOverlaps</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#maxrangereversals">MaxRangeReversals</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#maxranges">MaxRanges</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#mergetrailers">MergeTrailers</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#mutex">Mutex</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#namevirtualhost">NameVirtualHost</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#options">Options</a></li>
@@ -3061,6 +3062,18 @@ LogLevel info ssl_module:warn</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="MergeTrailers" id="MergeTrailers">MergeTrailers</a>
<a name="mergetrailers" id="mergetrailers">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Determins
whether trailers are merged into headers</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>MergeTrailers
[on|off]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>MergeTrailers
off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Bağlam:</a></th><td>sunucu
geneli, sanal konak</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Uyumluluk:</a></th><td>2.4.10
and later</td></tr>
+</table><p>Bu yönergenin belgesi henüz Türkçeye çevrilmedi.
+            Lütfen İngilizce sürümüne bakınız.</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="Mutex" id="Mutex">Mutex</a>
<a name="mutex" id="mutex">Yönergesi</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Muteks
mekanizmasını ve kilit dosyası dizinini tüm muteksler veya belirtilenler için yapılandırır</td></tr>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.de
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.de?rev=1619885&r1=1619884&r2=1619885&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.de (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.de Fri Aug 22 18:18:54 2014
@@ -381,6 +381,7 @@
 <li><a href="prefork.html#maxspareservers">MaxSpareServers</a></li>
 <li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
 <li><a href="mpm_netware.html#maxthreads">MaxThreads</a></li>
+<li><a href="core.html#mergetrailers">MergeTrailers</a></li>
 <li><a href="mod_cern_meta.html#metadir">MetaDir</a></li>
 <li><a href="mod_cern_meta.html#metafiles">MetaFiles</a></li>
 <li><a href="mod_cern_meta.html#metasuffix">MetaSuffix</a></li>

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=1619885&r1=1619884&r2=1619885&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 Fri Aug 22 18:18:54 2014
@@ -382,6 +382,7 @@
 <li><a href="prefork.html#maxspareservers">MaxSpareServers</a></li>
 <li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
 <li><a href="mpm_netware.html#maxthreads">MaxThreads</a></li>
+<li><a href="core.html#mergetrailers">MergeTrailers</a></li>
 <li><a href="mod_cern_meta.html#metadir">MetaDir</a></li>
 <li><a href="mod_cern_meta.html#metafiles">MetaFiles</a></li>
 <li><a href="mod_cern_meta.html#metasuffix">MetaSuffix</a></li>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.es
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.es?rev=1619885&r1=1619884&r2=1619885&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.es (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.es Fri Aug 22 18:18:54 2014
@@ -384,6 +384,7 @@
 <li><a href="prefork.html#maxspareservers">MaxSpareServers</a></li>
 <li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
 <li><a href="mpm_netware.html#maxthreads">MaxThreads</a></li>
+<li><a href="core.html#mergetrailers">MergeTrailers</a></li>
 <li><a href="mod_cern_meta.html#metadir">MetaDir</a></li>
 <li><a href="mod_cern_meta.html#metafiles">MetaFiles</a></li>
 <li><a href="mod_cern_meta.html#metasuffix">MetaSuffix</a></li>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.fr?rev=1619885&r1=1619884&r2=1619885&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.fr (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.fr Fri Aug 22 18:18:54 2014
@@ -382,6 +382,7 @@
 <li><a href="prefork.html#maxspareservers">MaxSpareServers</a></li>
 <li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
 <li><a href="mpm_netware.html#maxthreads">MaxThreads</a></li>
+<li><a href="core.html#mergetrailers">MergeTrailers</a></li>
 <li><a href="mod_cern_meta.html#metadir">MetaDir</a></li>
 <li><a href="mod_cern_meta.html#metafiles">MetaFiles</a></li>
 <li><a href="mod_cern_meta.html#metasuffix">MetaSuffix</a></li>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.ja.utf8
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.ja.utf8?rev=1619885&r1=1619884&r2=1619885&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.ja.utf8 [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.ja.utf8 [utf-8] Fri Aug 22
18:18:54 2014
@@ -379,6 +379,7 @@
 <li><a href="prefork.html#maxspareservers">MaxSpareServers</a></li>
 <li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
 <li><a href="mpm_netware.html#maxthreads">MaxThreads</a></li>
+<li><a href="core.html#mergetrailers">MergeTrailers</a></li>
 <li><a href="mod_cern_meta.html#metadir">MetaDir</a></li>
 <li><a href="mod_cern_meta.html#metafiles">MetaFiles</a></li>
 <li><a href="mod_cern_meta.html#metasuffix">MetaSuffix</a></li>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.ko.euc-kr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.ko.euc-kr?rev=1619885&r1=1619884&r2=1619885&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.ko.euc-kr [euc-kr] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.ko.euc-kr [euc-kr] Fri Aug
22 18:18:54 2014
@@ -379,6 +379,7 @@
 <li><a href="prefork.html#maxspareservers">MaxSpareServers</a></li>
 <li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
 <li><a href="mpm_netware.html#maxthreads">MaxThreads</a></li>
+<li><a href="core.html#mergetrailers">MergeTrailers</a></li>
 <li><a href="mod_cern_meta.html#metadir">MetaDir</a></li>
 <li><a href="mod_cern_meta.html#metafiles">MetaFiles</a></li>
 <li><a href="mod_cern_meta.html#metasuffix">MetaSuffix</a></li>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.tr.utf8
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.tr.utf8?rev=1619885&r1=1619884&r2=1619885&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.tr.utf8 [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.tr.utf8 [utf-8] Fri Aug 22
18:18:54 2014
@@ -378,6 +378,7 @@
 <li><a href="prefork.html#maxspareservers">MaxSpareServers</a></li>
 <li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
 <li><a href="mpm_netware.html#maxthreads">MaxThreads</a></li>
+<li><a href="core.html#mergetrailers">MergeTrailers</a></li>
 <li><a href="mod_cern_meta.html#metadir">MetaDir</a></li>
 <li><a href="mod_cern_meta.html#metafiles">MetaFiles</a></li>
 <li><a href="mod_cern_meta.html#metasuffix">MetaSuffix</a></li>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.zh-cn.utf8
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.zh-cn.utf8?rev=1619885&r1=1619884&r2=1619885&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.zh-cn.utf8 (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.zh-cn.utf8 Fri Aug 22 18:18:54
2014
@@ -377,6 +377,7 @@
 <li><a href="prefork.html#maxspareservers">MaxSpareServers</a></li>
 <li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
 <li><a href="mpm_netware.html#maxthreads">MaxThreads</a></li>
+<li><a href="core.html#mergetrailers">MergeTrailers</a></li>
 <li><a href="mod_cern_meta.html#metadir">MetaDir</a></li>
 <li><a href="mod_cern_meta.html#metafiles">MetaFiles</a></li>
 <li><a href="mod_cern_meta.html#metasuffix">MetaSuffix</a></li>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_log_config.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_log_config.html.en?rev=1619885&r1=1619884&r2=1619885&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_log_config.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_log_config.html.en Fri Aug 22 18:18:54
2014
@@ -234,6 +234,12 @@
         <td>Bytes transferred (received and sent), including request and headers,
         cannot be zero. This is the combination of %I and %O. You need to
         enable <code class="module"><a href="../mod/mod_logio.html">mod_logio</a></code>
to use this.</td></tr>
+<tr><td><code>%{<var>VARNAME</var>}^ti</code></td>
+        <td>The contents of <code><var>VARNAME</var>:</code>
trailer line(s)
+        in the request sent to the server.  </td></tr>
+<tr class="odd"><td><code>%{<var>VARNAME</var>}^to</code></td>
+        <td>The contents of <code><var>VARNAME</var>:</code>
trailer line(s)
+        in the response sent from the server.  </td></tr>
 </table>
 
     <h3><a name="modifiers" id="modifiers">Modifiers</a></h3>



Mime
View raw message