diff options
author | Jim Jagielski <jim@apache.org> | 2016-01-25 21:07:44 +0100 |
---|---|---|
committer | Jim Jagielski <jim@apache.org> | 2016-01-25 21:07:44 +0100 |
commit | 64183dd41f3a4c66a8cdbfc8c8a32e7794a0e949 (patch) | |
tree | ccbdbe1eb7eb82c52f6b06e64a16023c708f9b3e | |
parent | better s-maxage support (diff) | |
download | apache2-64183dd41f3a4c66a8cdbfc8c8a32e7794a0e949.tar.xz apache2-64183dd41f3a4c66a8cdbfc8c8a32e7794a0e949.zip |
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1726678 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | docs/manual/expr.xml.meta | 1 | ||||
-rw-r--r-- | docs/manual/mod/mod_deflate.xml.fr | 2 | ||||
-rw-r--r-- | docs/manual/mod/mod_deflate.xml.ja | 2 | ||||
-rw-r--r-- | docs/manual/mod/mod_deflate.xml.ko | 2 | ||||
-rw-r--r-- | docs/manual/mod/mod_proxy_hcheck.xml | 7 |
5 files changed, 9 insertions, 5 deletions
diff --git a/docs/manual/expr.xml.meta b/docs/manual/expr.xml.meta index d5a2e5e1a5..baaa5f7830 100644 --- a/docs/manual/expr.xml.meta +++ b/docs/manual/expr.xml.meta @@ -7,6 +7,7 @@ <relpath>.</relpath> <variants> + <variant>edited</variant> <variant>en</variant> <variant>fr</variant> </variants> diff --git a/docs/manual/mod/mod_deflate.xml.fr b/docs/manual/mod/mod_deflate.xml.fr index 1a7fdf0cbf..66b809b191 100644 --- a/docs/manual/mod/mod_deflate.xml.fr +++ b/docs/manual/mod/mod_deflate.xml.fr @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd"> <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?> -<!-- English Revision: 1724273:1726574 (outdated) --> +<!-- English Revision: 1724273:1726578 (outdated) --> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> diff --git a/docs/manual/mod/mod_deflate.xml.ja b/docs/manual/mod/mod_deflate.xml.ja index f14bfecfe2..151c977e0d 100644 --- a/docs/manual/mod/mod_deflate.xml.ja +++ b/docs/manual/mod/mod_deflate.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: 420990:1726574 (outdated) --> +<!-- English Revision: 420990:1726578 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/mod/mod_deflate.xml.ko b/docs/manual/mod/mod_deflate.xml.ko index 04d40d664c..3b82ecbcea 100644 --- a/docs/manual/mod/mod_deflate.xml.ko +++ b/docs/manual/mod/mod_deflate.xml.ko @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="EUC-KR" ?> <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd"> <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?> -<!-- English Revision: 151408:1726574 (outdated) --> +<!-- English Revision: 151408:1726578 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/mod/mod_proxy_hcheck.xml b/docs/manual/mod/mod_proxy_hcheck.xml index f72fb4e163..e5a1c520c9 100644 --- a/docs/manual/mod/mod_proxy_hcheck.xml +++ b/docs/manual/mod/mod_proxy_hcheck.xml @@ -105,7 +105,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://www3.example.com/ hcmethod=TCP hcinterval=5 + BalancerMember http://www3.example.com/ hcmethod=TCP hcinterval=5 hcpasses=2 hcfails=3 BalancerMember http://www4.example.com/ </Proxy> @@ -120,7 +120,10 @@ every 30 seconds, which is the default.</p> <p><code>http://www2.example.com/</code> is checked by sending a simple <code>HEAD</code> request every 10 seconds and making sure that the response status is 2xx, 3xx or 4xx. <code>http://www3.example.com/</code> is checked -every 5 seconds by simply ensuring that the socket to that server is up and <code>http://www4.example.com/</code> is +every 5 seconds by simply ensuring that the socket to that server is up. If the backend is marked as +"down" and it passes 2 health check, it will be re-enabled and added back into the load balancer. +It takes 3 back-to-back health check failures to disable the server and move it out +of rotation. Finally, <code>http://www4.example.com/</code> is not dynamically checked at all.</p> </section> |