From: Eric Covener Date: Thu, 17 Dec 2020 19:24:15 +0000 (+0000) Subject: xform X-Git-Tag: 2.5.0-alpha2-ci-test-only~1070 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b64cdba46303b400402bd282ca3f36444f80066;p=thirdparty%2Fapache%2Fhttpd.git xform [skip ci] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1884567 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/core.html.en.utf8 b/docs/manual/mod/core.html.en.utf8 index 1c9966b0dc6..6f7db58c5d8 100644 --- a/docs/manual/mod/core.html.en.utf8 +++ b/docs/manual/mod/core.html.en.utf8 @@ -69,6 +69,8 @@ available
  • FileETag
  • <Files>
  • <FilesMatch>
    • +
  • FlushMaxPipelined
    • +
  • FlushMaxThreshold
  • ForceType
  • GprofDir
  • HostnameLookups
    • @@ -108,6 +110,7 @@ available
  • Protocols
  • ProtocolsHonorOrder
  • QualifyRedirectURL
    • +
  • ReadBufferSize
  • RegexDefaultOptions
  • RegisterHttpMethod
  • RLimitCPU
    • @@ -1914,6 +1917,52 @@ filenames and <Files> sections work for an explanation of how these different sections are combined when a request is received + +
    top
    +

    FlushMaxPipelined Directive

    + + + + + + + + +
    Description:Maximum number of pipelined responses above which they are flushed +to the network
    Syntax:FlushMaxPipelined number
    Default:FlushMaxPipelined 5
    Context:server config, virtual host
    Status:Core
    Module:core
    Compatibility:2.5 and later
    +

    This directive allows to configure the maximum number of pipelined + responses, which remain pending so long as pipelined request are received. + When the limit is reached, reponses are forcibly flushed to the network in + blocking mode, until passing under the limit again.

    + +

    FlushMaxPipelined helps constraining memory + usage. When set to 0 pipelining is disabled, when set to + -1 there is no limit (FlushMaxThreshold + still applies).

    + +
    +
    top
    +

    FlushMaxThreshold Directive

    + + + + + + + + +
    Description:Threshold above which pending data are flushed to the +network
    Syntax:FlushMaxThresholdnumber-of-bytes
    Default:FlushMaxThreshold 65536
    Context:server config, virtual host
    Status:Core
    Module:core
    Compatibility:2.5 and later
    +

    This directive allows to configure the threshold for pending output + data (in bytes). When the limit is reached, data are forcibly flushed to + the network in blocking mode, until passing under the limit again.

    + +

    FlushMaxThreshold helps constraining memory + usage. When set to 0 or a too small value there are actually + no pending data, but for threaded MPMs there can be more threads busy + waiting for the network thus less ones available to handle the other + simultaneous connections.

    +
    top

    ForceType Directive

    @@ -2050,7 +2099,7 @@ media type in the HTTP Content-Type header field

    Finally, if you have hostname-based Require directives, a hostname lookup will be performed regardless of - the setting of HostnameLookups.

    + the setting of HostnameLookups.

    top
    @@ -2838,8 +2887,8 @@ will be accepted from the client Status:Core Module:core -

    Number is an integer from 0 (meaning unlimited) to - 32767. The default value is defined by the compile-time +

    Setting number at 0 means unlimited. + The default value is defined by the compile-time constant DEFAULT_LIMIT_REQUEST_FIELDS (100 as distributed).

    @@ -4155,6 +4204,25 @@ as if 'QualifyRedirectURL On' was configured. fully qualified URL, REDIRECT_URL will remain fully qualified.

    + +
    top
    +

    ReadBufferSize Directive

    + + + + + + + + +
    Description:Size of the buffers used to read data
    Syntax:ReadBufferSize bytes
    Default:ReadBufferSize 8192
    Context:server config, virtual host, directory
    Status:Core
    Module:core
    Compatibility:2.5 and later
    +

    This directive allows to configure the size (in bytes) of the memory + buffer used to read data from the network or files.

    + +

    A larger buffer can increase peformances with larger data, but consumes + more memory per connection. The minimum configurable size is + 1024.

    +
    top

    RegexDefaultOptions Directive

    @@ -5014,9 +5082,15 @@ certain events before failing a request of passing a -D argument to httpd.

    This directive can be used to toggle the use of <IfDefine> sections without needing to alter -D arguments in any startup scripts.

    -

    While this directive is supported in virtual host context, - the changes it makes are visible to any later configuration - directives, beyond any enclosing virtual host.

    + +

    Variable names may not contain colon ":" characters, to avoid clashes + with RewriteMap's syntax.

    + +

    Virtual Host scope and pitfalls

    +

    While this directive is supported in virtual host context, + the changes it makes are visible to any later configuration + directives, beyond any enclosing virtual host.

    +

    See also

    diff --git a/docs/manual/mod/mod_reqtimeout.html.en.utf8 b/docs/manual/mod/mod_reqtimeout.html.en.utf8 index 15c0e0b0d79..dd3b4011980 100644 --- a/docs/manual/mod/mod_reqtimeout.html.en.utf8 +++ b/docs/manual/mod/mod_reqtimeout.html.en.utf8 @@ -144,6 +144,11 @@ the request headers and/or body from client. configured with RequestReadTimeout are only effective after the server process has received the socket.

    +

    When waiting for a subsequent request on a kept-alive + connection, the timeout configured by KeepAliveTimeout applies regardless of + whether RequestReadTimeout is also + used.

    +

    For each of the three timeout stages (handshake, header or body), there are three ways to specify the timeout:

    diff --git a/docs/manual/mod/mod_ssl.html.en.utf8 b/docs/manual/mod/mod_ssl.html.en.utf8 index 060450e9137..18ed07c3119 100644 --- a/docs/manual/mod/mod_ssl.html.en.utf8 +++ b/docs/manual/mod/mod_ssl.html.en.utf8 @@ -1936,7 +1936,7 @@ SSLProxyCACertificateFile    .

    Status:Extension Module:mod_ssl Compatibility:The proxy section context is allowed in httpd 2.4.30 and later
    -Inclusion of non-leaf (CA) certificates is permitted in httpd 2.5.1 and later. +Inclusion of non-leaf (CA) certificates is permitted only in httpd 2.5.1 and later.

    This directive sets the all-in-one file where you keep the certificates and @@ -1948,7 +1948,7 @@ PEM-encoded certificate files. Use this directive alternatively or additionally to SSLProxyMachineCertificatePath. The referenced file can contain any number of pairs of client certificate and associated private key. Each pair can be specified in either (certificate, key) or (key, certificate) order. Non-leaf (CA) certificates can -also be included in the file, and will treated as if configured with SSLProxyMachineCertificateChainFile.

    +also be included in the file, and are treated as if configured with SSLProxyMachineCertificateChainFile.

    When challenged to provide a client certificate by a remote server, the server should provide a list of acceptable certificate diff --git a/docs/manual/mod/mod_ssl.xml.es b/docs/manual/mod/mod_ssl.xml.es index 78763d073fc..80142254cf4 100644 --- a/docs/manual/mod/mod_ssl.xml.es +++ b/docs/manual/mod/mod_ssl.xml.es @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/mod/mod_ssl.xml.fr b/docs/manual/mod/mod_ssl.xml.fr index 07640181fc9..2dd010ec4e6 100644 --- a/docs/manual/mod/mod_ssl.xml.fr +++ b/docs/manual/mod/mod_ssl.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/mod/mod_ssl.xml.meta b/docs/manual/mod/mod_ssl.xml.meta index d50eb9de390..194507ef078 100644 --- a/docs/manual/mod/mod_ssl.xml.meta +++ b/docs/manual/mod/mod_ssl.xml.meta @@ -9,6 +9,6 @@ en es - fr + fr diff --git a/docs/manual/new_features_2_0.html.en.utf8 b/docs/manual/new_features_2_0.html.en.utf8 index 79f0f76ab9b..f89fee7226b 100644 --- a/docs/manual/new_features_2_0.html.en.utf8 +++ b/docs/manual/new_features_2_0.html.en.utf8 @@ -29,7 +29,6 @@  ja  |  ko  |  pt-br  | - ru  |  tr 

    @@ -241,7 +240,6 @@  ja  |  ko  |  pt-br  | - ru  |  tr 

    top

    Comments

    Notice:
    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 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 mailing lists.