Re: [PATCH] DOC: fix typo in MAX_SESS_STKCTR
Hi Matteo, On Fri, Oct 16, 2020 at 05:45:54PM +0200, Matteo Contrini wrote: > Hi, > > I noticed that MAX_SESS_STKCTR is spelled wrong twice in the docs, so here's > a patch to fix it. Good catch, now applied! > I hope I didn't get anything wrong since it's my first contribution here. You got everything right, you're welcome to continue like this :-) Thank you! Willy
[PATCH] DOC: fix typo in MAX_SESS_STKCTR
Hi,
I noticed that MAX_SESS_STKCTR is spelled wrong twice in the docs, so here's a
patch to fix it.
I hope I didn't get anything wrong since it's my first contribution here. Also,
I'm not subscribed to the list so if you could CC me in replies it would be
appreciated.
Thanks!
--
Matteo
>From be7ae1db8d9ba8349b56a2f539a6d2a13dbfc6ef Mon Sep 17 00:00:00 2001
From: Matteo Contrini
Date: Fri, 16 Oct 2020 17:35:54 +0200
Subject: [PATCH] DOC: fix typo in MAX_SESS_STKCTR
MAX_SESS_STKCTR is spelled wrongly a couple of times
in the configuration docs (K and C are swapped). This patch
fixes the typos.
---
doc/configuration.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/configuration.txt b/doc/configuration.txt
index 6a90bfadb..4bc917929 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -6095,7 +6095,7 @@ http-request track-sc2 [table ] [ { if |
unless } ]
not stop evaluation and do not change default action. The number of counters
that may be simultaneously tracked by the same connection is set in
MAX_SESS_STKCTR at build time (reported in haproxy -vv) which defaults to 3,
- so the track-sc number is between 0 and (MAX_SESS_STCKTR-1). The first
+ so the track-sc number is between 0 and (MAX_SESS_STKCTR-1). The first
"track-sc0" rule executed enables tracking of the counters of the specified
table as the first set. The first "track-sc1" rule executed enables tracking
of the counters of the specified table as the second set. The first
@@ -11091,7 +11091,7 @@ tcp-request connection [{if | unless}
]
number of counters that may be simultaneously tracked by the same
connection is set in MAX_SESS_STKCTR at build time (reported in
haproxy -vv) which defaults to 3, so the track-sc number is between 0
-and (MAX_SESS_STCKTR-1). The first "track-sc0" rule executed enables
+and (MAX_SESS_STKCTR-1). The first "track-sc0" rule executed enables
tracking of the counters of the specified table as the first set. The
first "track-sc1" rule executed enables tracking of the counters of the
specified table as the second set. The first "track-sc2" rule executed
--
2.28.0.windows.1
Re: [PATCH] DOC: Fix typo in intro.txt
Hi Alain, On Fri, Jul 05, 2019 at 02:51:38PM +0200, Alain Belkadi wrote: > > Hello, > > You will find as attachement my first ultra-small contribution to the > documentation, a fix for a typo. Applied, thanks! Note, there's no small, let alone ultra-small, contribution :-) Willy
[PATCH] DOC: Fix typo in intro.txt
Hello, You will find as attachement my first ultra-small contribution to the documentation, a fix for a typo. Regards, -- [Alain Belkadi / LinuxBeach]From ba4a3f9674d31622a002a12a97b7ae6fdeb080b7 Mon Sep 17 00:00:00 2001 From: Alain Belkadi Date: Fri, 5 Jul 2019 10:12:40 +0200 Subject: [PATCH] DOC: Fix typo in intro.txt --- doc/intro.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/intro.txt b/doc/intro.txt index 0ee9fa2d..4eaf18ef 100644 --- a/doc/intro.txt +++ b/doc/intro.txt @@ -1071,7 +1071,7 @@ components. HAProxy provides very detailed logs, with millisecond accuracy and the exact connection accept time that can be searched in firewalls logs (e.g. for NAT -correlation). By default, TCP and HTTP logs are quite detailed an contain +correlation). By default, TCP and HTTP logs are quite detailed and contain everything needed for troubleshooting, such as source IP address and port, frontend, backend, server, timers (request receipt duration, queue duration, connection setup time, response headers time, data transfer time), global -- 2.11.0
[PATCH] DOC: Fix typo in req.ssl_alpn example (commit 4afdd138424ab...)
Also link to ssl_fc_alpn.
---
doc/configuration.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/configuration.txt b/doc/configuration.txt
index dc1f222..03a567d 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -15472,13 +15472,13 @@ req.ssl_alpn : string
request buffer and not to the contents deciphered via an SSL data layer, so
this will not work with "bind" lines having the "ssl" option. This is useful
in ACL to make a routing decision based upon the ALPN preferences of a TLS
- client, like in the example below.
+ client, like in the example below. See also "ssl_fc_alpn".
Examples :
# Wait for a client hello for at most 5 seconds
tcp-request inspect-delay 5s
tcp-request content accept if { req_ssl_hello_type 1 }
- use_backend bk_acme if { req_ssl.alpn acme-tls/1 }
+ use_backend bk_acme if { req.ssl_alpn acme-tls/1 }
default_backend bk_default
req.ssl_ec_ext : boolean
--
1.8.3.1
Re: [PATCH] DOC: Fix typo
Applied, thank you Bertrand. Willy
[PATCH] DOC: Fix typo
---
CONTRIBUTING | 6 +++---
include/types/connection.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/CONTRIBUTING b/CONTRIBUTING
index b5ba18241c1c..575e63b40039 100644
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -309,7 +309,7 @@ do not think about them anymore after a few patches.
A good rule of thumb is that if your identifiers start to contain more than
3 words or more than 15 characters, they can become confusing. For function
names it's less important especially if these functions are rarely used or
- are used in a complex context where it is important to differenciate between
+ are used in a complex context where it is important to differentiate between
their multiple variants.
9) Unified diff only
@@ -318,7 +318,7 @@ do not think about them anymore after a few patches.
that you have committed your patch to a local branch, with an appropriate
subject line and a useful commit message explaining what the patch attempts
to do. It is not strictly required to use git, but what is strictly required
- is to have all these elements in the same mail, easily distinguishible, and
+ is to have all these elements in the same mail, easily distinguishable, and
a patch in "diff -up" format (which is also the format used by Git). This
means the "unified" diff format must be used exclusively, and with the
function name printed in the diff header of each block. That significantly
@@ -773,7 +773,7 @@ sent to the mailing list : haproxy@formilux.org and CCed to
relevant subsystem
maintainers or authors of the modified files if their address appears at the
top of the file.
-Please don't send pull-requests, they are really unconvenient. First, a pull
+Please don't send pull-requests, they are really inconvenient. First, a pull
implies a merge operation and the code doesn't move fast enough to justify the
use of merges. Second, pull requests are not easily commented on by the
project's participants, contrary to e-mails where anyone is allowed to have an
diff --git a/include/types/connection.h b/include/types/connection.h
index 8a0ce79f40ff..3a7de64a537a 100644
--- a/include/types/connection.h
+++ b/include/types/connection.h
@@ -56,7 +56,7 @@ struct wait_event {
int wait_reason;
};
-/* A connection handle is how we differenciate two connections on the lower
+/* A connection handle is how we differentiate two connections on the lower
* layers. It usually is a file descriptor but can be a connection id.
*/
union conn_handle {
Re: [PATCH] DOC: Fix typo so fetch is properly parsed by Cyril's converter
applied, thanks Nenad. willy
[PATCH] DOC: Fix typo so fetch is properly parsed by Cyril's converter
Signed-off-by: Nenad Merdanovic --- doc/configuration.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/configuration.txt b/doc/configuration.txt index 80b9c01..19b7e1a 100644 --- a/doc/configuration.txt +++ b/doc/configuration.txt @@ -13218,7 +13218,7 @@ ssl_fc_has_sni : boolean that the SSL library is build with support for TLS extensions enabled (check haproxy -vv). -ssl_fc_is_resumed: boolean +ssl_fc_is_resumed : boolean Returns true if the SSL/TLS session has been resumed through the use of SSL session cache or TLS tickets. -- 2.8.1
Re: [PATCH] DOC: fix typo
Hi Godbach, On Wed, Dec 10, 2014 at 10:32:59AM +0800, Godbach wrote: > Hi Willy, > > There are some typos in latest snapshot in 1.6-dev0. Attached is the patch. > > There total files are modified as below: > > include/types/proto_http.h: hwen -> when > include/types/server.h: SRV_ST_DOWN -> SRV_ST_STOPPED > src/backend.c: prefer-current-server -> prefer-last-server > > Please see the patch for detailed information. In addition, this patch > should be backported to 1.5 if necessary. Great, thank you, applied to both versions. Cheers, Willy
[PATCH] DOC: fix typo
Hi Willy,
There are some typos in latest snapshot in 1.6-dev0. Attached is the patch.
There total files are modified as below:
include/types/proto_http.h: hwen -> when
include/types/server.h: SRV_ST_DOWN -> SRV_ST_STOPPED
src/backend.c: prefer-current-server -> prefer-last-server
Please see the patch for detailed information. In addition, this patch
should be backported to 1.5 if necessary.
--
Best Regards,
Godbach
From 73f3617908e1da775f10a2116394a1654d150d0f Mon Sep 17 00:00:00 2001
From: Godbach
Date: Wed, 10 Dec 2014 10:21:30 +0800
Subject: [PATCH] DOC: fix typo
include/types/proto_http.h: hwen -> when
include/types/server.h: SRV_ST_DOWN -> SRV_ST_STOPPED
src/backend.c: prefer-current-server -> prefer-last-server
Signed-off-by: Godbach
---
include/types/proto_http.h | 2 +-
include/types/server.h | 2 +-
src/backend.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/types/proto_http.h b/include/types/proto_http.h
index 95bf59d..2654b78 100644
--- a/include/types/proto_http.h
+++ b/include/types/proto_http.h
@@ -71,7 +71,7 @@
/* indicate how we *want* the connection to behave, regardless of what is in
* the headers. We have 4 possible values right now :
- * - WANT_KAL : try to maintain keep-alive (default hwen nothing configured)
+ * - WANT_KAL : try to maintain keep-alive (default when nothing configured)
* - WANT_TUN : will be a tunnel (CONNECT).
* - WANT_SCL : enforce close on the server side
* - WANT_CLO : enforce close on both sides
diff --git a/include/types/server.h b/include/types/server.h
index 4847def..1cabb83 100644
--- a/include/types/server.h
+++ b/include/types/server.h
@@ -43,7 +43,7 @@
#include
-/* server states. Only SRV_ST_DOWN indicates a down server. */
+/* server states. Only SRV_ST_STOPPED indicates a down server. */
enum srv_state {
SRV_ST_STOPPED = 0, /* the server is down. Please keep set
to zero. */
SRV_ST_STARTING, /* the server is warming up (up but
throttled) */
diff --git a/src/backend.c b/src/backend.c
index e222160..70ddaa7 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -553,7 +553,7 @@ int assign_server(struct session *s)
(__objt_server(conn->target)->nbpend + 1) <
s->be->max_ka_queue))) &&
srv_is_usable(__objt_server(conn->target))) {
/* This session was relying on a server in a previous request
-* and the proxy has "option prefer-current-server" set, so
+* and the proxy has "option prefer-last-server" set, so
* let's try to reuse the same server.
*/
srv = __objt_server(conn->target);
--
1.7.11.7
Re: [PATCH] DOC: fix typo in Unix Socket commands
On Sat, Jul 12, 2014 at 06:22:42PM +0200, Cyril Bonté wrote: > Konstantin Romanenko reported a typo in the HTML documentation. The typo is > already present in the raw text version : the "shutdown sessions" command > should be "shutdown sessions server". Applied, thank you Cyril. Willy
[PATCH] DOC: fix typo in Unix Socket commands
Konstantin Romanenko reported a typo in the HTML documentation. The typo is already present in the raw text version : the "shutdown sessions" command should be "shutdown sessions server". --- doc/configuration.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/configuration.txt b/doc/configuration.txt index d69bb11..5f1b1cd 100644 --- a/doc/configuration.txt +++ b/doc/configuration.txt @@ -14114,7 +14114,7 @@ shutdown session endless transfer is ongoing. Such terminated sessions are reported with a 'K' flag in the logs. -shutdown sessions / +shutdown sessions server / Immediately terminate all the sessions attached to the specified server. This can be used to terminate long-running sessions after a server is put into maintenance mode, for instance. Such terminated sessions are reported with a -- 2.0.1
Re: [PATCH] DOC: fix typo in comments
On 2013-10-2 1:12, Willy Tarreau wrote: On Wed, Oct 02, 2013 at 01:08:50AM +0800, Godbach wrote: It seems that you submit the whole text of mail as commit log to the git repository. Ah yes, you're right :-) At the moment I applied it, I was fooled by the subject into thinking it was just the patch itself. I'll be more careful next time. That's no big deal anyway, just looks ugly :-) Cheers, Willy I got it. It does not matter. :-) -- Best Regards, Godbach
Re: [PATCH] DOC: fix typo in comments
On Wed, Oct 02, 2013 at 01:08:50AM +0800, Godbach wrote: > It seems that you submit the whole text of mail as commit log to > the git repository. Ah yes, you're right :-) At the moment I applied it, I was fooled by the subject into thinking it was just the patch itself. I'll be more careful next time. That's no big deal anyway, just looks ugly :-) Cheers, Willy
Re: [PATCH] DOC: fix typo in comments
On 2013-10-1 15:49, Willy Tarreau wrote: Hi Godbach, On Mon, Sep 30, 2013 at 11:23:10AM +0800, Godbach wrote: Hi Willy, There is a patch to fix typo in comments, please check the attachment for you information. The commit log is as below: commit 9824d1b3740ac2746894f1aa611c795366c84210 Author: Godbach Date: Mon Sep 30 11:05:42 2013 +0800 DOC: fix typo in comments 0x2000 -> 0x4000 vuf -> buf ethod -> Method Signed-off-by: Godbach Patch applied, thanks! Willy Hi Willy, It seems that you submit the whole text of mail as commit log to the git repository. -- Best Regards, Godbach
Re: [PATCH] DOC: fix typo in comments
Hi Godbach, On Mon, Sep 30, 2013 at 11:23:10AM +0800, Godbach wrote: > Hi Willy, > > There is a patch to fix typo in comments, please check the attachment > for you information. > > The commit log is as below: > > commit 9824d1b3740ac2746894f1aa611c795366c84210 > Author: Godbach > Date: Mon Sep 30 11:05:42 2013 +0800 > > DOC: fix typo in comments > > 0x2000 -> 0x4000 > vuf -> buf > ethod -> Method > > Signed-off-by: Godbach Patch applied, thanks! Willy
[PATCH] DOC: fix typo in comments
Hi Willy,
There is a patch to fix typo in comments, please check the attachment
for you information.
The commit log is as below:
commit 9824d1b3740ac2746894f1aa611c795366c84210
Author: Godbach
Date: Mon Sep 30 11:05:42 2013 +0800
DOC: fix typo in comments
0x2000 -> 0x4000
vuf -> buf
ethod -> Method
Signed-off-by: Godbach
--
Best Regards,
Godbach
From 9824d1b3740ac2746894f1aa611c795366c84210 Mon Sep 17 00:00:00 2001
From: Godbach
Date: Mon, 30 Sep 2013 11:05:42 +0800
Subject: [PATCH] DOC: fix typo in comments
0x2000 -> 0x4000
vuf -> buf
ethod -> Method
Signed-off-by: Godbach
---
include/types/channel.h|4 ++--
include/types/proto_http.h |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/types/channel.h b/include/types/channel.h
index ee5f1b8..42160af 100644
--- a/include/types/channel.h
+++ b/include/types/channel.h
@@ -118,7 +118,7 @@
#define CF_NEVER_WAIT 0x0800 /* never wait for sending data
(permanent) */
#define CF_WAKE_ONCE 0x1000 /* pretend there is activity on this
channel (one-shoot) */
-/* unused: 0x2000, 0x2000, 0x8000 */
+/* unused: 0x2000, 0x4000, 0x8000 */
/* Use these masks to clear the flags before going back to lower layers */
#define CF_CLEAR_READ
(~(CF_READ_NULL|CF_READ_PARTIAL|CF_READ_ERROR|CF_READ_ATTACHED))
@@ -266,7 +266,7 @@ struct channel {
eventually leave the buffer. So as long as ->to_forward is larger than
global.maxrewrite, we can fill the buffer. If ->to_forward is smaller than
global.maxrewrite, then we don't want to fill the buffer with more than
- vuf->size - global.maxrewrite + ->to_forward.
+ buf->size - global.maxrewrite + ->to_forward.
A buffer may contain up to 5 areas :
- the data waiting to be sent. These data are located between buf->p-o and
diff --git a/include/types/proto_http.h b/include/types/proto_http.h
index 1d7c92f..d0fa766 100644
--- a/include/types/proto_http.h
+++ b/include/types/proto_http.h
@@ -121,7 +121,7 @@
/* these ones define a request start line */
#define HTTP_MSG_RQMETH2 // parsing the Method
-#define HTTP_MSG_RQMETH_SP 3 // space(s) after the ethod
+#define HTTP_MSG_RQMETH_SP 3 // space(s) after the Method
#define HTTP_MSG_RQURI 4 // parsing the Request URI
#define HTTP_MSG_RQURI_SP 5 // space(s) after the Request URI
#define HTTP_MSG_RQVER 6 // parsing the Request Version
--
1.7.7
