From: Luca Toscano Date: Wed, 20 Jun 2018 20:47:40 +0000 (+0000) Subject: documentation rebuild X-Git-Tag: 2.5.0-alpha2-ci-test-only~2547 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c781dd075c1d365beadcfbd09d2b7806d3b67519;p=thirdparty%2Fapache%2Fhttpd.git documentation rebuild git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1833952 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/mod_md.html.en b/docs/manual/mod/mod_md.html.en index 9fa7db15f1d..b51b82a853a 100644 --- a/docs/manual/mod/mod_md.html.en +++ b/docs/manual/mod/mod_md.html.en @@ -329,15 +329,15 @@ MDCertificateAgreement https://letsencrypt.org/documents/LE-SA-v1.2-November-15-

MDNotifyCmd Directive

- +
Description:Run a program when Managed Domain are ready.
Syntax:MDNotifyCmd path
Syntax:MDNotifyCmd path [ args ]
Context:server config
Status:Extension
Module:mod_md

The configured executable is run when Managed Domains have signed up or renewed their certificates. It is given the names of the processed MDs as - arguments. It should return status code 0 to indicate that it has - run successfully. + additional arguments (after the parameters specified here). It should + return status code 0 to indicate that it has run successfully.

diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en index 0756aff3124..de3c66bd0a5 100644 --- a/docs/manual/mod/mod_proxy.html.en +++ b/docs/manual/mod/mod_proxy.html.en @@ -1340,7 +1340,7 @@ ProxyPass "/mirror/foo" "http://backend.example.com" Route of the worker when used inside load balancer. The route is a value appended to session id. - status + status - Single letter value defining the initial status of this worker. @@ -1348,7 +1348,7 @@ ProxyPass "/mirror/foo" "http://backend.example.com" DWorker is disabled and will not accept any requests; will be automatically retried. SWorker is administratively stopped; will not accept requests - and will not be automatically retried + and will not be automatically retried. IWorker is in ignore-errors mode and will always be considered available. RWorker is a hot spare. For each worker in a given lbset that is unusable (draining, stopped, in error, etc.), a usable hot spare with the same lbset will be used in diff --git a/docs/manual/mod/mod_proxy_hcheck.html.en b/docs/manual/mod/mod_proxy_hcheck.html.en index d55780d1b5b..8b83424f824 100644 --- a/docs/manual/mod/mod_proxy_hcheck.html.en +++ b/docs/manual/mod/mod_proxy_hcheck.html.en @@ -46,10 +46,11 @@

Parameters

The health check mechanism is enabled via the use of additional - BalancerMember parameters, which are configured in the standard - way via ProxyPass:

+ BalancerMember parameters, which are configured + in the standard way via ProxyPass:

-

A new BalancerMember status state (flag) is defined via this module: "C". +

A new BalancerMember status state (flag) + is defined via this module: "C". When the worker is taken offline due to failures as determined by the health check module, this flag is set, and can be seen (and modified) via the balancer-manager.

@@ -87,10 +88,12 @@ Additional URI to be appended to the worker URL for the health check. hctemplate   - Name of template, created via ProxyHCTemplate to use for setting health check parameters for this worker + Name of template, created via ProxyHCTemplate, + to use for setting health check parameters for this worker hcexpr   - Name of expression, created via ProxyHCExpr, used to check response headers for health.
+ Name of expression, created via ProxyHCExpr, + used to check response headers for health.
If not used, 2xx thru 3xx status codes imply success
@@ -124,7 +127,7 @@ ProxyHCExpr in_maint {hc('body') !~ /Under maintenance/} <Proxy balancer://foo> BalancerMember http://www.example.com/ hcmethod=GET hcexpr=in_maint hcuri=/status.php - BalancerMember http://www2.example.com/ hcmethod=HEAD hcexpr=ok234 hcinterval=10 + BalancerMember http://www2.example.com/ hcmethod=HEAD hcexpr=ok234 hcinterval=10 BalancerMember http://www3.example.com/ hcmethod=TCP hcinterval=5 hcpasses=2 hcfails=3 BalancerMember http://www4.example.com/ </Proxy> @@ -150,8 +153,8 @@ not dynamically checked at all.

top

ProxyHCExpr Directive

- - + + @@ -161,7 +164,7 @@ not dynamically checked at all.

for creating a named condition expression that checks the response headers of the backend server to determine its health. This named condition can then be assigned to balancer members via the hcexpr - parameter

+ parameter.

ProxyHCExpr: Allow for 2xx/3xx/4xx as passing

ProxyHCExpr ok234 {%{REQUEST_STATUS} =~ /^[234]/}
 ProxyPass "/apps"     "balancer://foo"
@@ -199,7 +202,7 @@ ProxyPass "/apps"     "balancer://foo"
 
ProxyHCTemplate Directive
Description:Creates a named condition expression to use to determine health of the backend based on its response.
Syntax:ProxyHCExpr name {ap_expr expression}
Description:Creates a named condition expression to use to determine health of the backend based on its response
Syntax:ProxyHCExpr name {ap_expr expression}
Context:server config, virtual host
Override:FileInfo
Status:Extension
- + @@ -208,7 +211,7 @@ ProxyPass "/apps" "balancer://foo"

The ProxyHCTemplate directive allows for creating a named set (template) of health check parameters that can then be assigned to balancer members via the hctemplate - parameter

+ parameter.

ProxyHCTemplate

ProxyHCTemplate tcp5 hcmethod=tcp hcinterval=5
 ProxyPass "/apps"     "balancer://foo"
@@ -223,8 +226,8 @@ ProxyPass "/apps"     "balancer://foo"
 
top

 
ProxyHCTPsize Directive
Description:Creates a named template for setting various health check parameters
Syntax:ProxyHCTemplate name parameter=setting <...>
Syntax:ProxyHCTemplate name parameter=setting [...]
Context:server config, virtual host
Override:FileInfo
Status:Extension
- - + + diff --git a/docs/manual/mod/mod_ratelimit.html.en b/docs/manual/mod/mod_ratelimit.html.en index 094ae17fb09..eae399a85be 100644 --- a/docs/manual/mod/mod_ratelimit.html.en +++ b/docs/manual/mod/mod_ratelimit.html.en @@ -33,7 +33,10 @@ -
Description:Sets the total server-wide size of the threadpool used for the health check workers.
Syntax:ProxyHCTPsize <size>
Description:Sets the total server-wide size of the threadpool used for the health check workers
Syntax:ProxyHCTPsize size
Context:server config
Status:Extension
Module:mod_proxy_hcheck
Status:Extension
Module Identifier:ratelimit_module
Source File:mod_ratelimit.c
Compatibility:rate-initial-burst available in httpd 2.4.24 and later.
+Compatibility: + rate-initial-burst available in httpd 2.4.24 and later. + Rate limiting proxied content does not work correctly up to httpd 2.4.33. +

Summary

diff --git a/docs/manual/mod/mod_ratelimit.xml.fr b/docs/manual/mod/mod_ratelimit.xml.fr index 890ddb25bfc..ed6c6801667 100644 --- a/docs/manual/mod/mod_ratelimit.xml.fr +++ b/docs/manual/mod/mod_ratelimit.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/mod/mod_ratelimit.xml.meta b/docs/manual/mod/mod_ratelimit.xml.meta index 9cd2c2d9d2a..c44ea5cee2a 100644 --- a/docs/manual/mod/mod_ratelimit.xml.meta +++ b/docs/manual/mod/mod_ratelimit.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/mod/mod_ssl.html.en b/docs/manual/mod/mod_ssl.html.en index 2330fab9fc9..715c39427b9 100644 --- a/docs/manual/mod/mod_ssl.html.en +++ b/docs/manual/mod/mod_ssl.html.en @@ -2051,8 +2051,8 @@ The following source variants are available:

This is the always available builtin seeding source. Its usage consumes minimum CPU cycles under runtime and hence can be always used without drawbacks. The source used for seeding the PRNG contains of the - current time, the current process id and (when applicable) a randomly - chosen 1KB extract of the inter-process scoreboard structure of Apache. + current time, the current process id and a randomly + chosen 128 bytes extract of the stack. The drawback is that this is not really a strong source and at startup time (where the scoreboard is still not available) this source just produces a few bytes of entropy. So you should always, at least for the diff --git a/docs/manual/mod/overrides.html.en b/docs/manual/mod/overrides.html.en index a58fe71bec1..b38d9769532 100644 --- a/docs/manual/mod/overrides.html.en +++ b/docs/manual/mod/overrides.html.en @@ -613,7 +613,7 @@ a matching file with MultiViews ProxyFCGISetEnvIfmod_proxy_fcgi Allow variables sent to FastCGI servers to be fixed up ProxyHCExprmod_proxy_hcheck -Creates a named condition expression to use to determine health of the backend based on its response. +Creates a named condition expression to use to determine health of the backend based on its response ProxyHCTemplatemod_proxy_hcheck Creates a named template for setting various health check parameters QualifyRedirectURLcore diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en index 712080adb1f..b5f01cda8d2 100644 --- a/docs/manual/mod/quickreference.html.en +++ b/docs/manual/mod/quickreference.html.en @@ -738,7 +738,7 @@ simultaneously MDMember hostnamesEAdditional hostname for the managed domain. MDMembers auto|manual auto sEControl if the alias domain names are automatically added. MDMustStaple on|off off sEControl if new certificates carry the OCSP Must Staple flag. -MDNotifyCmd pathsERun a program when Managed Domain are ready. +MDNotifyCmd path [ args ]sERun a program when Managed Domain are ready. MDomain dns-name [ other-dns-name... ] [auto|manual]sEDefine list of domain names that belong to one group. <MDomainSet dns-name [ other-dns-name... ]>...</MDomainSet>sEContainer for directives applied to the same managed domains. MDPortMap map1 [ map2 ] 80:80 443:443 sEMap external to internal ports for domain ownership verification. @@ -827,9 +827,9 @@ response ProxyFtpDirCharset character set ISO-8859-1 svdEDefine the character set for proxied FTP listings ProxyFtpEscapeWildcards [on|off]svdEWhether wildcards in requested filenames are escaped when sent to the FTP server ProxyFtpListOnWildcard [on|off]svdEWhether wildcards in requested filenames trigger a file listing -ProxyHCExpr name {ap_expr expression}svECreates a named condition expression to use to determine health of the backend based on its response. -ProxyHCTemplate name parameter=setting <...>svECreates a named template for setting various health check parameters -ProxyHCTPsize <size>sESets the total server-wide size of the threadpool used for the health check workers. +ProxyHCExpr name {ap_expr expression}svECreates a named condition expression to use to determine health of the backend based on its response +ProxyHCTemplate name parameter=setting [...]svECreates a named template for setting various health check parameters +ProxyHCTPsize sizesESets the total server-wide size of the threadpool used for the health check workers ProxyHTMLBufSize bytessvdBSets the buffer size increment for buffering inline scripts and stylesheets. ProxyHTMLCharsetOut Charset | *svdBSpecify a charset for mod_proxy_html output.