From: Yann Ylavic Date: Mon, 7 Mar 2022 16:49:42 +0000 (+0000) Subject: Sync docs [skip ci] X-Git-Tag: 2.5.0-alpha2-ci-test-only~453 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03280590ee09d16b2e1349c7d15e5ad88ebb4289;p=thirdparty%2Fapache%2Fhttpd.git 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 bc8ad76c573..e64e02503f2 100644 --- 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-attributes\fR ] [ -\fBX\fR \fIproxy\fR[:\fIport\fR] ] [ -\fBy\fR \fI-attributes\fR ] [ -\fBz\fR \fI
-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-attributes\fR ] [ -\fBX\fR \fIproxy\fR[:\fIport\fR] ] [ -\fBy\fR \fI-attributes\fR ] [ -\fBz\fR \fI + (RFC4514) and LDAP filter escaping (RFC4515).
+ (Available in httpd 2.4.53 and later)
-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 67c458eb8f4..c84a0368c32 100644 --- a/docs/manual/expr.html.en.utf8 +++ b/docs/manual/expr.html.en.utf8 @@ -549,7 +549,8 @@ DIGIT ::= <any US-ASCII digit "0".."9"> regular file)restricted
ldap Escape characters as required by LDAP distinguished name escaping - (RFC4514) and LDAP filter escaping (RFC4515).
replace 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 b935709cc28..377a9acdeff 100644 --- a/docs/manual/mod/core.html.en.utf8 +++ b/docs/manual/mod/core.html.en.utf8 @@ -3021,12 +3021,18 @@ from the client
Status:Core
Module:core
-

Limit (in bytes) on maximum size of an XML-based request - body. A value of 0 will disable any checking.

- +

Limit (in bytes) on the maximum size of an XML-based request + body. A value of 0 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. +

Example:

- 
LimitXMLRequestBody 0
+ 
# Limit of 1 MiB
+LimitXMLRequestBody 1073741824
diff --git a/docs/manual/mod/core.html.fr.utf8 b/docs/manual/mod/core.html.fr.utf8 index e9281ec99f8..e3e4f44bdd0 100644 --- a/docs/manual/mod/core.html.fr.utf8 +++ b/docs/manual/mod/core.html.fr.utf8 @@ -33,6 +33,8 @@  ja  |  tr 

+
Cette traduction peut être périmée. Vérifiez la version + anglaise pour les changements récents.
Description:Fonctionnalités de base du serveur HTTP Apache toujours disponibles
Statut:Noyau httpd
diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de index 1290747375d..a5803e448c6 100644 --- a/docs/manual/mod/core.xml.de +++ b/docs/manual/mod/core.xml.de @@ -1,7 +1,7 @@ - + + + diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja index 8239a96c033..050e9fb3833 100644 --- a/docs/manual/mod/core.xml.ja +++ b/docs/manual/mod/core.xml.ja @@ -1,7 +1,7 @@ - + + + diff --git a/docs/manual/rewrite/flags.xml.meta b/docs/manual/rewrite/flags.xml.meta index 912229af035..e4f3ee6f495 100644 --- a/docs/manual/rewrite/flags.xml.meta +++ b/docs/manual/rewrite/flags.xml.meta @@ -8,6 +8,6 @@ en - fr + fr