DOC: remove old tunnel mode assumptions

Michał Pasierb reported doc inconsistencies regarding the old default
HTTP tunnel mode.

This patch fixes a few of those inconsistencies and should be backported
to both 1.6 and 1.5.
This commit is contained in:
Lukas Tribus 2016-02-03 18:09:37 +01:00 committed by Willy Tarreau
parent c34d19fc3c
commit f01a9cde38

View File

@ -2620,11 +2620,11 @@ cookie <name> [ rewrite | insert | prefix ] [ indirect ] [ nocache ]
of complex combinations of "Set-cookie" and "Cache-control" of complex combinations of "Set-cookie" and "Cache-control"
headers is left to the application. The application can then headers is left to the application. The application can then
decide whether or not it is appropriate to emit a persistence decide whether or not it is appropriate to emit a persistence
cookie. Since all responses should be monitored, this mode only cookie. Since all responses should be monitored, this mode
works in HTTP close mode. Unless the application behaviour is doesn't work in HTTP tunnel mode. Unless the application
very complex and/or broken, it is advised not to start with this behaviour is very complex and/or broken, it is advised not to
mode for new deployments. This keyword is incompatible with start with this mode for new deployments. This keyword is
"insert" and "prefix". incompatible with "insert" and "prefix".
insert This keyword indicates that the persistence cookie will have to insert This keyword indicates that the persistence cookie will have to
be inserted by haproxy in server responses if the client did not be inserted by haproxy in server responses if the client did not
@ -2650,7 +2650,7 @@ cookie <name> [ rewrite | insert | prefix ] [ indirect ] [ nocache ]
and a delimiter. The prefix will be removed from all client and a delimiter. The prefix will be removed from all client
requests so that the server still finds the cookie it emitted. requests so that the server still finds the cookie it emitted.
Since all requests and responses are subject to being modified, Since all requests and responses are subject to being modified,
this mode requires the HTTP close mode. The "prefix" keyword is this mode doesn't work with tunnel mode. The "prefix" keyword is
not compatible with "rewrite" and "insert". Note: it is highly not compatible with "rewrite" and "insert". Note: it is highly
recommended not to use "indirect" with "prefix", otherwise server recommended not to use "indirect" with "prefix", otherwise server
cookie updates would not be sent to clients. cookie updates would not be sent to clients.
@ -5347,11 +5347,9 @@ no option http-use-proxy-header
By setting this option in a frontend, haproxy can automatically switch to use By setting this option in a frontend, haproxy can automatically switch to use
that non-standard header if it sees proxied requests. A proxied request is that non-standard header if it sees proxied requests. A proxied request is
defined here as one where the URI begins with neither a '/' nor a '*'. The defined here as one where the URI begins with neither a '/' nor a '*'. This
choice of header only affects requests passing through proxies making use of is incompatible with the HTTP tunnel mode. Note that this option can only be
one of the "httpclose", "forceclose" and "http-server-close" options. Note specified in a frontend and will affect the request along its whole life.
that this option can only be specified in a frontend and will affect the
request along its whole life.
Also, when this option is set, a request which requires authentication will Also, when this option is set, a request which requires authentication will
automatically switch to use proxy authentication headers if it is itself a automatically switch to use proxy authentication headers if it is itself a
@ -5500,10 +5498,8 @@ no option http_proxy
No host address resolution is performed, so this only works when pure IP No host address resolution is performed, so this only works when pure IP
addresses are passed. Since this option's usage perimeter is rather limited, addresses are passed. Since this option's usage perimeter is rather limited,
it will probably be used only by experts who know they need exactly it. Last, it will probably be used only by experts who know they need exactly it. This
if the clients are susceptible of sending keep-alive requests, it will be is incompatible with the HTTP tunnel mode.
needed to add "option httpclose" to ensure that all requests will correctly
be analyzed.
If this option has been enabled in a "defaults" section, it can be disabled If this option has been enabled in a "defaults" section, it can be disabled
in a specific instance by prepending the "no" keyword before it. in a specific instance by prepending the "no" keyword before it.
@ -14773,7 +14769,7 @@ Most common cases :
spent accepting these connections will inevitably slightly delay processing spent accepting these connections will inevitably slightly delay processing
of other connections, and it can happen that request times in the order of of other connections, and it can happen that request times in the order of
a few tens of milliseconds are measured after a few thousands of new a few tens of milliseconds are measured after a few thousands of new
connections have been accepted at once. Setting "option http-server-close" connections have been accepted at once. Using one of the keep-alive modes
may display larger request times since "Tq" also measures the time spent may display larger request times since "Tq" also measures the time spent
waiting for additional requests. waiting for additional requests.