From 611cefffc91729921413d377eefd56f279f7fd48 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Wed, 21 Jun 2017 15:07:16 +0000 Subject: [PATCH] xforms... again. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799465 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/mod_proxy.html.en | 24 +++++++++++-------- docs/manual/mod/mod_proxy.xml.fr | 2 +- docs/manual/mod/mod_proxy.xml.ja | 2 +- docs/manual/mod/quickreference.html.de | 2 +- docs/manual/mod/quickreference.html.en | 2 +- docs/manual/mod/quickreference.html.es | 2 +- docs/manual/mod/quickreference.html.ko.euc-kr | 2 +- docs/manual/mod/quickreference.html.tr.utf8 | 2 +- .../manual/mod/quickreference.html.zh-cn.utf8 | 2 +- 9 files changed, 22 insertions(+), 18 deletions(-) diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en index 93e6b85d52..ea4fed2fe5 100644 --- a/docs/manual/mod/mod_proxy.html.en +++ b/docs/manual/mod/mod_proxy.html.en @@ -259,7 +259,8 @@ ProxyVia On

This will create a worker associated with the origin server URL http://backend.example.com that will use the given timeout - values. When used in a forward proxy, workers are usually defined + values. All timeouts use the time-interval + directive syntax. When used in a forward proxy, workers are usually defined via the ProxySet directive:

ProxySet http://backend.example.com connectiontimeout=5 timeout=30
@@ -1189,7 +1190,7 @@ ProxyPass "/mirror/foo" "http://backend.example.com" Connect timeout in seconds. The number of seconds Apache httpd waits for the creation of a connection to the backend to complete. By adding a postfix of ms, the timeout can be - also set in milliseconds. + also set in milliseconds. Uses the time-interval directive syntax disablereuse Off @@ -1221,7 +1222,8 @@ ProxyPass "/mirror/foo" "http://backend.example.com" flushwait 10 The time to wait for additional input, in milliseconds, before - flushing the output brigade if 'flushpackets' is 'auto'. Uses time-interval directive syntax. + flushing the output brigade if 'flushpackets' is 'auto'. + Uses time-interval directive syntax. iobuffersize 8192 @@ -1240,7 +1242,7 @@ ProxyPass "/mirror/foo" "http://backend.example.com"

The frequency of initial and subsequent TCP keepalive probes depends on global OS settings, and may be as high as 2 hours. To be useful, the frequency configured in the OS must be smaller than the threshold used - by the firewall. Uses time-interval directive syntax.

+ by the firewall. Uses the time-interval directive syntax.

lbset 0 @@ -1267,7 +1269,7 @@ ProxyPass "/mirror/foo" "http://backend.example.com" which could be an issue, but it will lower the traffic in case some of the cluster nodes are down or busy. By adding a postfix of ms, the delay can be also set in - milliseconds. Uses time-interval directive syntax. + milliseconds. Uses the time-interval directive syntax. receivebuffersize 0 @@ -1291,7 +1293,8 @@ ProxyPass "/mirror/foo" "http://backend.example.com" Apache httpd will not forward any requests to that server until the timeout expires. This enables to shut down the backend server for maintenance and bring it back online later. A value of 0 means always retry workers - in an error state with no timeout. Uses time-interval directive syntax. + in an error state with no timeout. + Uses the time-interval directive syntax. route - @@ -1323,14 +1326,14 @@ ProxyPass "/mirror/foo" "http://backend.example.com" ProxyTimeout Connection timeout in seconds. The number of seconds Apache httpd waits for data sent by / to the backend. - Uses time-interval directive syntax. + Uses the time-interval directive syntax. ttl - Time to live for inactive connections and associated connection pool entries, in seconds. Once reaching this limit, a connection will not be used again; it will be closed at some - later time. Uses time-interval directive syntax. + later time. Uses the time-interval directive syntax. flusher flush @@ -1408,7 +1411,8 @@ ProxyPass "/mirror/foo" "http://backend.example.com" timeout 0 Balancer timeout in seconds. If set, this will be the maximum time - to wait for a free worker. The default is to not wait. Uses time-interval directive syntax. + to wait for a free worker. The default is to not wait. + Uses the time-interval directive syntax. failonstatus - @@ -1963,7 +1967,7 @@ expressions

ProxyTimeout Directive

- + diff --git a/docs/manual/mod/mod_proxy.xml.fr b/docs/manual/mod/mod_proxy.xml.fr index a76c951bfe..97dcbc8805 100644 --- a/docs/manual/mod/mod_proxy.xml.fr +++ b/docs/manual/mod/mod_proxy.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/mod/mod_proxy.xml.ja b/docs/manual/mod/mod_proxy.xml.ja index 0a85835cf2..bb474e9cf7 100644 --- a/docs/manual/mod/mod_proxy.xml.ja +++ b/docs/manual/mod/mod_proxy.xml.ja @@ -1,7 +1,7 @@ - +
Description:Network timeout for proxied requests
Syntax:ProxyTimeout seconds
Syntax:ProxyTimeout time-interval[s]
Default:Value of Timeout
Context:server config, virtual host
Status:Extension