RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-04 15:19:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

DOC: fix name for "option independant-streams"

Browse Source 
The correct spelling is "independent", not "independant". This patch
fixes the doc and the configuration parser to accept the correct form.
The config parser still allows the old naming for backwards compatibility.
This commit is contained in:
Jamie Gloudon 2012-08-25 00:18:33 -04:00 committed by Willy Tarreau
parent aaa21008a7
commit 801a0a353a
7 changed files with 22 additions and 17 deletions

20
doc/configuration.txt
View File

@ -874,7 +874,7 @@ during a reload, it typically takes a fraction of a second even for large
tables.
peers <peersect>
Creates a new peer list with name <peersect>. It is an independant section,
Creates a new peer list with name <peersect>. It is an independent section,
which is referenced by one or more stick-tables.
peer <peername> <ip>:<port>
@ -1026,7 +1026,7 @@ option httpchk X - X X
option httpclose (*) X X X X
option httplog X X X X
option http_proxy (*) X X X X
option independant-streams (*) X X X X
option independent-streams (*) X X X X
option ldap-check X - X X
option log-health-checks (*) X - X X
option log-separate-errors (*) X X X -
@ -1507,7 +1507,7 @@ bind /<path> [, ...] [ group <user> | gid <gid> ]
<address:port> couple must be used only once among all
instances running on a same system. Please note that binding
to ports lower than 1024 generally require particular
privileges to start the program, which are independant of
privileges to start the program, which are independent of
the 'uid' parameter.
<path> is a UNIX socket path beginning with a slash ('/'). This is
@ -3538,9 +3538,9 @@ no option http_proxy
See also : "option httpclose"
option independant-streams
no option independant-streams
Enable or disable independant timeout processing for both directions
option independent-streams
no option independent-streams
Enable or disable independent timeout processing for both directions
May be used in sections : defaults | frontend | listen | backend
yes | yes | yes | yes
Arguments : none
@ -3568,6 +3568,10 @@ no option independant-streams
data sent to the server. Doing so will typically break large HTTP posts from
slow lines, so use it with caution.
Note: older versions used to call this setting "option independant-streams"
with a spelling mistake. This spelling is still supported but
deprecated.
See also : "timeout client", "timeout server" and "timeout tunnel"
@ -7390,7 +7394,7 @@ following situations :
A first set of criteria applies to information which does not require any
analysis of the request or response contents. Those generally include TCP/IP
addresses and ports, as well as internal values independant on the stream.
addresses and ports, as well as internal values independent on the stream.
always_false
This one never matches. All values and flags are ignored. It may be used as
@ -8423,7 +8427,7 @@ and to every request on the "img", "video", "download" and "ftp" hosts :
It is also possible to form rules using "anonymous ACLs". Those are unnamed ACL
expressions that are built on the fly without needing to be declared. They must
be enclosed between braces, with a space before and after each brace (because
the braces must be seen as independant words). Example :
the braces must be seen as independent words). Example :
The following rule :

4
doc/haproxy-en.txt
View File

@ -408,7 +408,7 @@ Service sections start with the 'listen' keyword :
descriptors with a simple range. The <addr:port> couple must be used only once
among all instances running on a same system. Please note that attaching to
ports lower than 1024 need particular priviledges to start the program, which
are independant of the 'uid' parameter.
are independent of the 'uid' parameter.
- the <IP_address>:<port_range> couple may be repeated indefinitely to require
the proxy to listen to other addresses and/or ports. To achieve this, simply
@ -630,7 +630,7 @@ of this allows a configuration reload without service interruption :
2.5) Connections expiration time
--------------------------------
It is possible (and recommended) to configure several time-outs on TCP
connections. Three independant timers are adjustable with values specified
connections. Three independent timers are adjustable with values specified
in milliseconds. A session will be terminated if either one of these timers
expire.

2
include/types/proxy.h
View File

@ -119,7 +119,7 @@ enum {
#define PR_O2_RDPC_PRST 0x00000200 /* Actvate rdp cookie analyser */
#define PR_O2_CLFLOG 0x00000400 /* log into clf format */
#define PR_O2_LOGHCHKS 0x00000800 /* log health checks */
#define PR_O2_INDEPSTR 0x00001000 /* independant streams, don't update rex on write */
#define PR_O2_INDEPSTR 0x00001000 /* independent streams, don't update rex on write */
#define PR_O2_SOCKSTAT 0x00002000 /* collect & provide separate statistics for sockets */
/* appsession */

4
include/types/stream_interface.h
View File

@ -28,7 +28,7 @@
#include <types/buffers.h>
#include <common/config.h>
/* A stream interface must have its own errors independantly of the buffer's,
/* A stream interface must have its own errors independently of the buffer's,
* so that applications can rely on what the buffer reports while the stream
* interface is performing some retries (eg: connection error). Some states are
* transient and do not last beyond process_session().
@ -70,7 +70,7 @@ enum {
SI_FL_WAIT_DATA = 0x0008, /* waiting for more data to send */
SI_FL_CAP_SPLTCP = 0x0010, /* splicing possible from/to TCP */
SI_FL_DONT_WAKE = 0x0020, /* resync in progress, don't wake up */
SI_FL_INDEP_STR = 0x0040, /* independant streams = don't update rex on write */
SI_FL_INDEP_STR = 0x0040, /* independent streams = don't update rex on write */
SI_FL_NOLINGER = 0x0080, /* may close without lingering. One-shot. */
SI_FL_NOHALF = 0x0100, /* no half close, close both sides at once */
SI_FL_SRC_ADDR = 0x1000, /* get the source ip/port with getsockname */

1
src/cfgparse.c
View File

@ -161,6 +161,7 @@ static const struct cfg_opt cfg_opts2[] =
{ "tcp-smart-accept", PR_O2_SMARTACC, PR_CAP_FE, 0, 0 },
{ "tcp-smart-connect", PR_O2_SMARTCON, PR_CAP_BE, 0, 0 },
{ "independant-streams", PR_O2_INDEPSTR, PR_CAP_FE|PR_CAP_BE, 0, 0 },
{ "independent-streams", PR_O2_INDEPSTR, PR_CAP_FE|PR_CAP_BE, 0, 0 },
{ "http-use-proxy-header", PR_O2_USE_PXHDR, PR_CAP_FE, 0, PR_MODE_HTTP },
{ "http-pretend-keepalive", PR_O2_FAKE_KA, PR_CAP_FE|PR_CAP_BE, 0, PR_MODE_HTTP },
{ "http-no-delay", PR_O2_NODELAY, PR_CAP_FE|PR_CAP_BE, 0, PR_MODE_HTTP },

2
src/checks.c
View File

@ -1619,7 +1619,7 @@ int start_checks() {
* We also determine the minimum interval among all of those which
* have an interval larger than SRV_CHK_INTER_THRES. This interval
* will be used to spread their start-up date. Those which have
* a shorter interval will start independantly and will not dictate
* a shorter interval will start independently and will not dictate
* too short an interval for all others.
*/
for (px = proxy; px; px = px->next) {

6
src/sock_raw.c
View File

@ -715,7 +715,7 @@ static int sock_raw_write(int fd)
if (tick_isset(si->ib->rex) && !(si->flags & SI_FL_INDEP_STR)) {
/* Note: to prevent the client from expiring read timeouts
* during writes, we refresh it. We only do this if the
* interface is not configured for "independant streams",
* interface is not configured for "independent streams",
* because for some applications it's better not to do this,
* for instance when continuously exchanging small amounts
* of data which can full the socket buffers long before a
@ -931,7 +931,7 @@ static void sock_raw_data_finish(struct stream_interface *si)
* for incoming data or not. So in order to prevent the socket from
* expiring read timeouts during writes, we refresh the read timeout,
* except if it was already infinite or if we have explicitly setup
* independant streams.
* independent streams.
*/
ib->rex = tick_add_ifset(now_ms, ib->rto);
}
@ -1059,7 +1059,7 @@ static void sock_raw_chk_snd(struct stream_interface *si)
if (tick_isset(si->ib->rex) && !(si->flags & SI_FL_INDEP_STR)) {
/* Note: to prevent the client from expiring read timeouts
* during writes, we refresh it. We only do this if the
* interface is not configured for "independant streams",
* interface is not configured for "independent streams",
* because for some applications it's better not to do this,
* for instance when continuously exchanging small amounts
* of data which can full the socket buffers long before a