Sync docs [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1898709 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/man/ab.1 b/docs/man/ab.1
index bc8ad76c573325b59fc10b4c91f544491de45b0a..e64e02503f2f1518c643b2cab3d5ce41f28c03f3 100644 (file)
--- a/docs/man/ab.1
+++ b/docs/man/ab.1
@@ -19,7 +19,7 @@
 .el .ne 3
 .IP "\\$1" \\$2
 ..
-.TH "AB" 1 "2018-09-27" "Apache HTTP Server" "ab"
+.TH "AB" 1 "2022-03-07" "Apache HTTP Server" "ab"
 
 .SH NAME
 ab \- Apache HTTP server benchmarking tool
@@ -27,7 +27,7 @@ ab \- Apache HTTP server benchmarking tool
 .SH "SYNOPSIS"
  
 .PP
-\fB\fBab\fR [ -\fBA\fR \fIauth-username\fR:\fIpassword\fR ] [ -\fBb\fR \fIwindowsize\fR ] [ -\fBB\fR \fIlocal-address\fR ] [ -\fBc\fR \fIconcurrency\fR ] [ -\fBC\fR \fIcookie-name\fR=\fIvalue\fR ] [ -\fBd\fR ] [ -\fBe\fR \fIcsv-file\fR ] [ -\fBE\fR \fIclient-certificate file\fR ] [ -\fBf\fR \fIprotocol\fR ] [ -\fBg\fR \fIgnuplot-file\fR ] [ -\fBh\fR ] [ -\fBH\fR \fIcustom-header\fR ] [ -\fBi\fR ] [ -\fBk\fR ] [ -\fBl\fR ] [ -\fBm\fR \fIHTTP-method\fR ] [ -\fBn\fR \fIrequests\fR ] [ -\fBp\fR \fIPOST-file\fR ] [ -\fBP\fR \fIproxy-auth-username\fR:\fIpassword\fR ] [ -\fBq\fR ] [ -\fBr\fR ] [ -\fBs\fR \fItimeout\fR ] [ -\fBS\fR ] [ -\fBt\fR \fItimelimit\fR ] [ -\fBT\fR \fIcontent-type\fR ] [ -\fBu\fR \fIPUT-file\fR ] [ -\fBv\fR \fIverbosity\fR] [ -\fBV\fR ] [ -\fBw\fR ] [ -\fBx\fR \fI<table>-attributes\fR ] [ -\fBX\fR \fIproxy\fR[:\fIport\fR] ] [ -\fBy\fR \fI<tr>-attributes\fR ] [ -\fBz\fR \fI<td>-attributes\fR ] [ -\fBZ\fR \fIciphersuite\fR ] [http[s]://]\fIhostname\fR[:\fIport\fR]/\fIpath\fR\fR
+\fB\fBab\fR [ -\fBA\fR \fIauth-username\fR:\fIpassword\fR ] [ -\fBb\fR \fIwindowsize\fR ] [ -\fBB\fR \fIlocal-address\fR ] [ -\fBc\fR \fIconcurrency\fR ] [ -\fBC\fR \fIcookie-name\fR=\fIvalue\fR ] [ -\fBd\fR ] [ -\fBe\fR \fIcsv-file\fR ] [ -\fBE\fR \fIclient-certificate file\fR ] [ -\fBf\fR \fIprotocol\fR ] [ -\fBg\fR \fIgnuplot-file\fR ] [ -\fBh\fR ] [ -\fBH\fR \fIcustom-header\fR ] [ -\fBi\fR ] [ -\fBk\fR ] [ -\fBl\fR ] [ -\fBm\fR \fIHTTP-method\fR ] [ -\fBn\fR \fIrequests\fR ] [ -\fBp\fR \fIPOST-file\fR ] [ -\fBP\fR \fIproxy-auth-username\fR:\fIpassword\fR ] [ -\fBq\fR ] [ -\fBr\fR ] [ -\fBR\fR \fIrampdelay\fR ] [ -\fBs\fR \fItimeout\fR ] [ -\fBS\fR ] [ -\fBt\fR \fItimelimit\fR ] [ -\fBT\fR \fIcontent-type\fR ] [ -\fBu\fR \fIPUT-file\fR ] [ -\fBv\fR \fIverbosity\fR] [ -\fBV\fR ] [ -\fBw\fR ] [ -\fBx\fR \fI<table>-attributes\fR ] [ -\fBX\fR \fIproxy\fR[:\fIport\fR] ] [ -\fBy\fR \fI<tr>-attributes\fR ] [ -\fBz\fR \fI<td>-attributes\fR ] [ -\fBZ\fR \fIciphersuite\fR ] [http[s]://]\fIhostname\fR[:\fIport\fR]/\fIpath\fR\fR
  
 
 .SH "SUMMARY"
@@ -103,6 +103,9 @@ When processing more than 150 requests, \fBab\fR outputs a progress count on \fB
 \fB-r\fR
 Don't exit on socket receive errors\&.  
 .TP
+\fB-R \fIrampdelay\fR\fR
+Milliseconds in between each new connection when starting up\&. Default is no delay\&. Starting too many concurrent connections at once can trigger denial of service protection on the network, which limits the effectiveness of the test\&. Introducing a delay between starting each concurrent connection can work around this problem\&. The test may complete before full ramp up of concurrent connections is achieved\&. If this happens, the total number of concurrent connections achieved is noted in the results\&. Available in 2\&.5\&.1 and later\&.  
+.TP
 \fB-s \fItimeout\fR\fR
 Maximum number of seconds to wait before the socket times out\&. Default is 30 seconds\&. Available in 2\&.4\&.4 and later\&.  
 .TP

diff --git a/docs/manual/expr.html.en.utf8 b/docs/manual/expr.html.en.utf8
index 67c458eb8f4717e274bd9077a5c50f834b865f80..c84a0368c32a81eed29db86feb342ddce7322e29 100644 (file)
--- a/docs/manual/expr.html.en.utf8
+++ b/docs/manual/expr.html.en.utf8
@@ -549,7 +549,8 @@ DIGIT       ::= &lt;any US-ASCII digit "0".."9"&gt;</pre>
             regular file)</td><td>restricted</td></tr>
 <tr><td><code>ldap</code></td>
         <td>Escape characters as required by LDAP distinguished name escaping
-            (RFC4514) and LDAP filter escaping (RFC4515).</td><td /></tr>
+            (RFC4514) and LDAP filter escaping (RFC4515).<br />
+            (Available in httpd 2.4.53 and later)</td><td /></tr>
 <tr class="odd"><td><code>replace</code></td>
         <td>replace(string, "from", "to") replaces all occurrences of "from"
             in the string with "to". The first parameter must not be a literal string.

diff --git a/docs/manual/mod/core.html.en.utf8 b/docs/manual/mod/core.html.en.utf8
index b935709cc284f0adb1041f4cfe8e9a5be70f97f7..377a9acdeff417302819de9e5e75b9dfde1e9eb2 100644 (file)
--- a/docs/manual/mod/core.html.en.utf8
+++ b/docs/manual/mod/core.html.en.utf8
@@ -3021,12 +3021,18 @@ from the client</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>
 </table>
-    <p>Limit (in bytes) on maximum size of an XML-based request
-    body. A value of <code>0</code> will disable any checking.</p>
-
+    <p>Limit (in bytes) on the maximum size of an XML-based request
+    body. A value of <code>0</code> will apply a hard limit (depending on
+    32bit vs 64bit system) allowing for XML escaping within the bounds of
+    the system addressable memory, but it exists for compatibility only
+    and is not recommended since it does not account for memory consumed
+    elsewhere or concurrent requests, which might result in an overall
+    system out-of-memory.
+    </p>
     <p>Example:</p>
 
-    <pre class="prettyprint lang-config">LimitXMLRequestBody 0</pre>
+    <pre class="prettyprint lang-config"># Limit of 1 MiB
+LimitXMLRequestBody 1073741824</pre>
 
 
 

diff --git a/docs/manual/mod/core.html.fr.utf8 b/docs/manual/mod/core.html.fr.utf8
index e9281ec99f84f43bd4fb965e896e35ce1e0df56f..e3e4f44bdd0a6d47dcc063cdbfb55734db5d2e5a 100644 (file)
--- a/docs/manual/mod/core.html.fr.utf8
+++ b/docs/manual/mod/core.html.fr.utf8
@@ -33,6 +33,8 @@
 <a href="../ja/mod/core.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../tr/mod/core.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </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>Fonctionnalités de base du serveur HTTP Apache toujours
 disponibles</td></tr>
 <tr><th><a href="module-dict.html#Status">Statut:</a></th><td>Noyau httpd</td></tr></table>

diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de
index 1290747375d250d9260dc1b19776bd64d40895ab..a5803e448c68babc29cca6f94195070076396c26 100644 (file)
--- a/docs/manual/mod/core.xml.de
+++ b/docs/manual/mod/core.xml.de
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 344972:1896414 (outdated) -->
+<!-- English Revision: 344972:1898702 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/core.xml.es b/docs/manual/mod/core.xml.es
index f4a7b5c8e80621da6d57f62dc2217cdc388dcc17..97d6a16e3d31ebe4941aee04599279a5592c77ad 100644 (file)
--- a/docs/manual/mod/core.xml.es
+++ b/docs/manual/mod/core.xml.es
@@ -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.es.xsl"?>
-<!-- English Revision: 1741251:1896414 (outdated) -->
+<!-- English Revision: 1741251:1898702 (outdated) -->
 <!-- Translated by Luis Gil de Bernabé Pfeiffer lgilbernabe[AT]apache.org -->
 <!-- Reviewed by Sergio Ramos-->
 <!--

diff --git a/docs/manual/mod/core.xml.fr b/docs/manual/mod/core.xml.fr
index 74eaa0e64838c2374382fd3ac833e2651a9d38f3..f576a3e3049cb70c21e66f35c70febf85e604f32 100644 (file)
--- a/docs/manual/mod/core.xml.fr
+++ b/docs/manual/mod/core.xml.fr
@@ -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.fr.xsl"?>
-<!-- English Revision: 1896414:1897273 (outdated) -->
+<!-- English Revision: 1896414:1898702 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 

diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja
index 8239a96c0334f9180725be7a737c5a0ed1ca7ef1..050e9fb383395c0746fa3cd0131541787ef4bd8c 100644 (file)
--- a/docs/manual/mod/core.xml.ja
+++ b/docs/manual/mod/core.xml.ja
@@ -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: 669847:1896414 (outdated) -->
+<!-- English Revision: 669847:1898702 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/core.xml.meta b/docs/manual/mod/core.xml.meta
index e78755527afd76e79a93204836e49a52f246c2bf..b9d96ee4c52f9b48a91a39e026f2df4b34b47a06 100644 (file)
--- a/docs/manual/mod/core.xml.meta
+++ b/docs/manual/mod/core.xml.meta
@@ -10,7 +10,7 @@
     <variant outdated="yes">de</variant>
     <variant>en</variant>
     <variant outdated="yes">es</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">tr</variant>
   </variants>

diff --git a/docs/manual/mod/core.xml.tr b/docs/manual/mod/core.xml.tr
index 83ef378647100c088e7fb0773af3b635ae368861..a78d1a07ebb5b186806ba817e1eb51d496d025bb 100644 (file)
--- a/docs/manual/mod/core.xml.tr
+++ b/docs/manual/mod/core.xml.tr
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1302855:1896414 (outdated) -->
+<!-- English Revision: 1302855:1898702 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>

diff --git a/docs/manual/programs/ab.html.en.utf8 b/docs/manual/programs/ab.html.en.utf8
index 2bb73c8a532e20331b6aa922d77a14b82e7c3fce..6bc5f61ed2d600bad3b732a07265a3cf4113a4c1 100644 (file)
--- a/docs/manual/programs/ab.html.en.utf8
+++ b/docs/manual/programs/ab.html.en.utf8
@@ -65,6 +65,7 @@
     [ -<strong>P</strong> <var>proxy-auth-username</var>:<var>password</var> ]
     [ -<strong>q</strong> ]
     [ -<strong>r</strong> ]
+    [ -<strong>R</strong> <var>rampdelay</var> ]
     [ -<strong>s</strong> <var>timeout</var> ]
     [ -<strong>S</strong> ]
     [ -<strong>t</strong> <var>timelimit</var> ]
@@ -178,6 +179,17 @@
     <dt><code>-r</code></dt>
     <dd>Don't exit on socket receive errors.</dd>
 
+    <dt><code>-R <var>rampdelay</var></code></dt>
+    <dd>Milliseconds in between each new connection when starting up.
+    Default is no delay. Starting too many concurrent connections at once can
+    trigger denial of service protection on the network, which limits the
+    effectiveness of the test. Introducing a delay between starting each
+    concurrent connection can work around this problem. The test may complete
+    before full ramp up of concurrent connections is achieved. If this happens,
+    the total number of concurrent connections achieved is noted in the results.
+    <br />
+    Available in 2.5.1 and later.</dd>
+
     <dt><code>-s <var>timeout</var></code></dt>
     <dd>Maximum number of seconds to wait before the socket times out.
     Default is 30 seconds.<br />

diff --git a/docs/manual/rewrite/flags.html.en.utf8 b/docs/manual/rewrite/flags.html.en.utf8
index f3e400760fa0f0a79aaa14d941b5399f8c359f9a..d9d9d5477949a53c0df3c83bc3d30b8c3061d148 100644 (file)
--- a/docs/manual/rewrite/flags.html.en.utf8
+++ b/docs/manual/rewrite/flags.html.en.utf8
@@ -203,7 +203,7 @@ browsers that support this feature.</dd>
 <dt>samesite</dt>
 <dd>If set to anything other than <code>false</code> or <code>0</code>, the <code>SameSite</code>
 attribute is set to the specified value.  Typical values are <code>None</code>,
-<code>Lax</code>, and <code>Strict</code>.Available in 2.5.1 and later.</dd>
+<code>Lax</code>, and <code>Strict</code>. Available in 2.5.1 and later.</dd>
 </dl>
 
 

diff --git a/docs/manual/rewrite/flags.html.fr.utf8 b/docs/manual/rewrite/flags.html.fr.utf8
index 56d9217a402aa720e25a04e0a65def3d3ba31ae3..c83dee749e72ac9fb1658b414a3e31ca8d309fab 100644 (file)
--- a/docs/manual/rewrite/flags.html.fr.utf8
+++ b/docs/manual/rewrite/flags.html.fr.utf8
@@ -26,6 +26,8 @@
 <p><span>Langues Disponibles: </span><a href="../en/rewrite/flags.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../fr/rewrite/flags.html" title="Français">&nbsp;fr&nbsp;</a></p>
 </div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+            anglaise pour les changements récents.</div>
 
 <p>Ce document décrit les drapeaux disponibles dans la directive
 <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code>, en fournissant

diff --git a/docs/manual/rewrite/flags.xml.fr b/docs/manual/rewrite/flags.xml.fr
index e2b86ba09837edb334be5456760f68de56c1ea96..c94e5dba2acd7b7d50160176ef5e39c61bf9bcd7 100644 (file)
--- a/docs/manual/rewrite/flags.xml.fr
+++ b/docs/manual/rewrite/flags.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1881263 -->
+<!-- English Revision: 1881263:1898647 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 

diff --git a/docs/manual/rewrite/flags.xml.meta b/docs/manual/rewrite/flags.xml.meta
index 912229af035fb274402498f5449e79893fcdc4f0..e4f3ee6f49579d22f3ac151854846aa839f83758 100644 (file)
--- a/docs/manual/rewrite/flags.xml.meta
+++ b/docs/manual/rewrite/flags.xml.meta
@@ -8,6 +8,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
   </variants>
 </metafile>