---
CONTRIBUTING | 2 +-
addons/promex/README | 2 +-
dev/gdb/ebtree.gdb | 4 ++--
doc/configuration.txt | 18 +++++++++---------
doc/design-thoughts/numa-auto.txt | 4 ++--
doc/lua-api/index.rst | 4 ++--
doc/management.txt | 4 ++--
include/haproxy/connection-t.h | 2 +-
include/haproxy/connection.h | 2 +-
include/haproxy/global-t.h | 2 +-
include/haproxy/h1_htx.h | 2 +-
include/haproxy/http_ana-t.h | 2 +-
include/haproxy/openssl-compat.h | 2 +-
include/haproxy/proxy-t.h | 2 +-
include/haproxy/quic_cc-t.h | 2 +-
include/haproxy/quic_pacing-t.h | 2 +-
include/haproxy/sc_strm.h | 2 +-
include/haproxy/spoe-t.h | 2 +-
include/import/cebtree-prv.h | 2 +-
reg-tests/compression/basic.vtc | 2 +-
src/activity.c | 4 ++--
src/backend.c | 2 +-
src/cfgparse-global.c | 4 ++--
src/cfgparse-quic.c | 4 ++--
src/cpu_topo.c | 4 ++--
src/haproxy.c | 12 ++++++------
src/hlua.c | 2 +-
src/http_act.c | 4 ++--
src/http_ext.c | 6 +++---
src/jws.c | 2 +-
src/mux_h1.c | 2 +-
src/mux_h2.c | 2 +-
src/mux_quic.c | 4 ++--
src/proto_quic.c | 2 +-
src/proxy.c | 2 +-
src/queue.c | 2 +-
src/quic_cc_bbr.c | 2 +-
src/quic_conn.c | 4 ++--
src/quic_rx.c | 4 ++--
src/quic_stream.c | 6 +++---
src/quic_tx.c | 4 ++--
src/sample.c | 2 +-
src/sink.c | 2 +-
src/sock.c | 2 +-
src/ssl_ckch.c | 4 ++--
src/stats-proxy.c | 4 ++--
src/stick_table.c | 2 +-
src/tools.c | 2 +-
48 files changed, 80 insertions(+), 80 deletions(-)
diff --git a/CONTRIBUTING b/CONTRIBUTING
index 60a78baee..8fae24a08 100644
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -1010,7 +1010,7 @@ you notice you're already practising some of them:
- continue to send pull requests after having been explained why they are not
welcome.
- - give wrong advices to people asking for help, or sending them patches to
+ - give wrong advice to people asking for help, or sending them patches to
try which make no sense, waste their time, and give them a bad impression
of the people working on the project.
diff --git a/addons/promex/README b/addons/promex/README
index 6226e62af..44a298848 100644
--- a/addons/promex/README
+++ b/addons/promex/README
@@ -94,7 +94,7 @@ name must be preceded by a minus character ('-'). Here are
examples:
* Add section description as label for all metrics
It is possible to set a description in global and proxy sections, via the
-"description" directive. The global descrption is exposed if it is define via
+"description" directive. The global description is exposed if it is define via
the "haproxy_process_description" metric. But the descriptions provided in
proxy
sections are not dumped. However, it is possible to add it as a label for all
metrics of the corresponding section, including the global one. To do so,
diff --git a/dev/gdb/ebtree.gdb b/dev/gdb/ebtree.gdb
index c7a6b943d..a6b03e949 100644
--- a/dev/gdb/ebtree.gdb
+++ b/dev/gdb/ebtree.gdb
@@ -25,7 +25,7 @@ end
# returns $node filled with the first node of ebroot $arg0
define ebtree_first
- # browse ebtree left until encoutering leaf
+ # browse ebtree left until encountering leaf
set $node = (struct eb_node *)$arg0->b[0]
while 1
_ebtree_set_tag_node $node
@@ -76,7 +76,7 @@ end
# returns $node filled with the first node of ebroot $arg0
define ebsctree_first
- # browse ebsctree left until encoutering leaf
+ # browse ebsctree left until encountering leaf
set $node = (struct eb32sc_node *)$arg0->b[0]
while 1
_ebsctree_set_tag_node $node
diff --git a/doc/configuration.txt b/doc/configuration.txt
index 868bdaeec..1571b9340 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -1961,7 +1961,7 @@ cpu-policy <policy>
thread groups.
This mapping is normally performed using the "cpu-map" directive, though it
- can be particularly difficult to maintain on heterogenous systems.
+ can be particularly difficult to maintain on heterogeneous systems.
The "cpu-policy" directive chooses between a small number of allocation
policies which one to use instead, when "cpu-map" is not used. The following
@@ -4223,7 +4223,7 @@ tune.max-rules-at-once <number>
cpu-demanding actions (e.g.: actions that work on content) may create thread
contention as all the rules from a given ruleset are evaluated under the same
polling loop if the evaluation is not interrupted. This option ensures that
no
- more than <number> number of rules may be excecuted under the same polling
+ more than <number> number of rules may be executed under the same polling
loop for content-oriented rulesets (those that already support yielding due
to content inspection). What it does is that it forces the evaluating
function
to yield, so that it comes back on the next polling loop to continues the
@@ -4883,9 +4883,9 @@ subsystem. This will dump debug messages about a specific
subsystem. It is a
very powerful tool to diagnose issues. Traces can be dynamically configured via
the CLI. It is also possible to predefined some settings in the configuration
file, in dedicated "traces" sections. More details about traces can be found in
-the management guide. It remains a developper tools used during complex
+the management guide. It remains a developer tools used during complex
debugging sessions. It is pretty verbose and have a cost, so use it with
-caution. And because it is a developper tool, there is no warranty about the
+caution. And because it is a developer tool, there is no warranty about the
backward compatibility of this section.
traces
@@ -5993,7 +5993,7 @@ specified in a previous "defaults" section. Keywords
supported in defaults
sections marked with "(!)" are only supported in named defaults sections, not
anonymous ones.
-Note: Some dangerous and not recommanded directives are intentionnaly not
+Note: Some dangerous and not recommended directives are intentionnaly not
listed in the following matrix. It is on purpose. These directives are
documentated. But by not listing them below is one more way to discourage
anyone to use it.
@@ -7938,7 +7938,7 @@ hash-preserve-affinity { always | maxconn | maxqueue }
The following values can be specified:
- - "always" : this is the default stategy. A stream is assigned to a
+ - "always" : this is the default strategy. A stream is assigned to a
server based on hashing irrespective of whether the server
is currently saturated.
@@ -17991,8 +17991,8 @@ agent-check
to set the weight of a server. Setting it with the "weight:" prefix is
preferred.
- - The string "weight:" following by an positive interger or a positive
- interger percentage, with no space. If the value ends with the '%' sign,
+ - The string "weight:" following by an positive integer or a positive
+ integer percentage, with no space. If the value ends with the '%' sign,
then the new weight will be proportional to the initially weight of the
server. Otherwise, the value is considered as an absolute weight and must
be between 0 and 256. Servers which are part of a farm running a static
@@ -22242,7 +22242,7 @@ when(<condition>[,<args>...])
some rarely needed data that should only be emitted under certain conditions,
such as debugging information when an error is met.
- The condition is made of a keyword among the list below, optionally preceeded
+ The condition is made of a keyword among the list below, optionally preceded
by an exclamation mark ('!') to negate it, and optionally suffixed by some
arguments specific to that condition:
diff --git a/doc/design-thoughts/numa-auto.txt
b/doc/design-thoughts/numa-auto.txt
index c58695b65..6f25394f9 100644
--- a/doc/design-thoughts/numa-auto.txt
+++ b/doc/design-thoughts/numa-auto.txt
@@ -1326,7 +1326,7 @@ Problem: we need to set the restrictions first to
eliminate undesired CPUs,
is considered the best CPUs. So the preference really looks like
a different setting.
-More precisely, the final stategy involves multiple criteria. For example,
+More precisely, the final strategy involves multiple criteria. For example,
let's say that the number of threads is set to 4 and we've restricted ourselves
to using the first thread of each CPU core. We're on an EPYC74F3, there are 3
cores per CCX. One algorithm (resource) would create one group with 3 threads
@@ -1444,7 +1444,7 @@ for example. However not all boards report their cluster
number (see CIX-P1
above). However the info about the capacity still allows to figure that and
should probably be used for that. At this point it would seem logical to say
that the cluster number is re-adjusted based on the claimed capacity, at
-least to avoid accidentally mixing workloads on heterogenous cores. But
+least to avoid accidentally mixing workloads on heterogeneous cores. But
sorting by cluster number might not necessarily work if allocated randomly.
So we might need a distinct metric that doesn't require to override the
system's numbering, like a "set", "group", "team", "bond", "bunch", "club",
diff --git a/doc/lua-api/index.rst b/doc/lua-api/index.rst
index 11de93882..456f915d4 100644
--- a/doc/lua-api/index.rst
+++ b/doc/lua-api/index.rst
@@ -3464,7 +3464,7 @@ Patref class
in case of duplicated entries, only the first matching entry is returned.
.. Warning::
- Not meant to be shared bewteen multiple contexts. If multiple contexts
+ Not meant to be shared between multiple contexts. If multiple contexts
need to work on the same pattern reference, each context should have
its own patref object.
@@ -3494,7 +3494,7 @@ Patref class
.. js:function:: Patref.commit(ref)
Tries to commit pending Patref object updates, that is updates made to the
- local object will be committed to the underlying patter reference storage
+ local object will be committed to the underlying pattern reference storage
in an atomic manner upon success. Upon failure, local pending updates are
lost. Upon success, all other pending updates on the pattern reference
(e.g.: "prepare" from the cli or from other Patref Lua objects) started
diff --git a/doc/management.txt b/doc/management.txt
index 5d4ca5681..face1c89c 100644
--- a/doc/management.txt
+++ b/doc/management.txt
@@ -3339,7 +3339,7 @@ show sess [<options>*]
output reports less entries than really exist because it will dump all
existing streams up to the last one that was created before the command was
entered; those which die in the mean time will not appear.
- For supported opitons, see below.
+ For supported options, see below.
show sess [<id> | all | help] [<options>*]
Display a lot of internal information about the matching streams. The command
@@ -3807,7 +3807,7 @@ show ssl sni [-f <frontend>] [-A]
The 'SNI' column shows the SNI, it can be either a CN, a SAN or a filter
from a crt-list.
The default certificates of a bind line, (which are either declared
- explicitely by 'default-crt' or is implicitely the first certificate of a
bind
+ explicitly by 'default-crt' or is implicitly the first certificate of a bind
line when no 'strict-sni' is used) shows the '*' character in the SNI column.
The 'Negative Filter' column is the list of negative filters associated to a
diff --git a/include/haproxy/connection-t.h b/include/haproxy/connection-t.h
index 98f6cc471..62808dfa9 100644
--- a/include/haproxy/connection-t.h
+++ b/include/haproxy/connection-t.h
@@ -332,7 +332,7 @@ enum proto_proxy_side {
/* ctl command used by mux->ctl() */
enum mux_ctl_type {
- MUX_CTL_STATUS, /* Expects an int as output, sets it to a combinaison
of MUX_CTL_STATUS flags */
+ MUX_CTL_STATUS, /* Expects an int as output, sets it to a combination
of MUX_CTL_STATUS flags */
MUX_CTL_EXIT_STATUS, /* Expects an int as output, sets the mux
exist/error/http status, if known or 0 */
MUX_CTL_REVERSE_CONN, /* Notify about an active reverse connection
accepted. */
MUX_CTL_SUBS_RECV, /* Notify the mux it must wait for read events again
*/
diff --git a/include/haproxy/connection.h b/include/haproxy/connection.h
index a76f0ac13..2963ec076 100644
--- a/include/haproxy/connection.h
+++ b/include/haproxy/connection.h
@@ -784,7 +784,7 @@ static inline const char *tevt_evts2str(uint32_t evts)
if (!evt)
continue;
- /* Backend location are displayed in captial letter */
+ /* Backend location are displayed in capital letter */
is_back = !!((evt >> 4) & 0x8);
switch ((enum term_event_loc)((evt >> 4) & ~0x8)) {
case tevt_loc_fd: tevt_evts_str[idx++] = (is_back ?
'F' : 'f'); break;
diff --git a/include/haproxy/global-t.h b/include/haproxy/global-t.h
index e54a388a1..a31112fa8 100644
--- a/include/haproxy/global-t.h
+++ b/include/haproxy/global-t.h
@@ -169,7 +169,7 @@ struct global {
unsigned char cluster_secret[16]; /* 128 bits of an SHA1 digest of a
secret defined as ASCII string */
struct {
int maxpollevents; /* max number of poll events at once */
- int max_rules_at_once; /* max number of rules excecuted in a
single evaluation loop */
+ int max_rules_at_once; /* max number of rules executed in a
single evaluation loop */
int maxaccept; /* max number of consecutive accept() */
int options; /* various tuning options */
uint debug; /* various debugging options (GDBG_*) */
diff --git a/include/haproxy/h1_htx.h b/include/haproxy/h1_htx.h
index 61b96e084..ae67c8fdf 100644
--- a/include/haproxy/h1_htx.h
+++ b/include/haproxy/h1_htx.h
@@ -38,7 +38,7 @@ int h1_parse_msg_tlrs(struct h1m *h1m, struct htx *dsthtx,
struct buffer *srcbuf, size_t ofs, size_t max);
/* Returns the URI of an HTX message in the most common format for a H1 peer.
It
- * is the path part of an absolute URI when the URI was normalized, ortherwise
+ * is the path part of an absolute URI when the URI was normalized, otherwise
* it is the whole URI, as received. Concretely, it is only a special case for
* URIs received from H2 clients, to be able to send a relative path the H1
* servers.
diff --git a/include/haproxy/http_ana-t.h b/include/haproxy/http_ana-t.h
index 10b8273d1..b2937e86c 100644
--- a/include/haproxy/http_ana-t.h
+++ b/include/haproxy/http_ana-t.h
@@ -168,7 +168,7 @@ enum {
REDIRECT_FLAG_FROM_REQ = 4, /* redirect rule on the request path */
REDIRECT_FLAG_IGNORE_EMPTY = 8, /* silently ignore empty location
expressions */
REDIRECT_FLAG_KEEP_QS = 16, /* append the query string to location,
if any */
- REDIRECT_FLAG_COOKIE_FMT = 32, /* The cookie value is a log-format
stirng*/
+ REDIRECT_FLAG_COOKIE_FMT = 32, /* The cookie value is a log-format
string */
};
/* Redirect types (location, prefix, extended ) */
diff --git a/include/haproxy/openssl-compat.h b/include/haproxy/openssl-compat.h
index 360cf7716..d7f0830f2 100644
--- a/include/haproxy/openssl-compat.h
+++ b/include/haproxy/openssl-compat.h
@@ -408,7 +408,7 @@ static inline unsigned long ERR_peek_error_func(const char
**func)
#define SSL_OP_CIPHER_SERVER_PREFERENCE 0
#endif
-/* needs OpenSSL >= 0.9.7 and renegotation options on WolfSSL */
+/* needs OpenSSL >= 0.9.7 and renegotiation options on WolfSSL */
#if !defined(SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION) || \
(defined(USE_OPENSSL_WOLFSSL) && !defined(HAVE_SECURE_RENEGOTIATION)
&& !defined(HAVE_SERVER_RENEGOTIATION_INFO))
#undef SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION
diff --git a/include/haproxy/proxy-t.h b/include/haproxy/proxy-t.h
index 5ad420129..c2aeefed1 100644
--- a/include/haproxy/proxy-t.h
+++ b/include/haproxy/proxy-t.h
@@ -299,7 +299,7 @@ struct error_snapshot {
char buf[VAR_ARRAY]; /* copy of the beginning of the
message for bufsize bytes */
};
-/* Each proxy will have one occurence of this structure per thread group */
+/* Each proxy will have one occurrence of this structure per thread group */
struct proxy_per_tgroup {
struct queue queue;
} THREAD_ALIGNED(64);
diff --git a/include/haproxy/quic_cc-t.h b/include/haproxy/quic_cc-t.h
index 5f55eb2ed..b38ba7f27 100644
--- a/include/haproxy/quic_cc-t.h
+++ b/include/haproxy/quic_cc-t.h
@@ -123,7 +123,7 @@ struct quic_cc_path {
uint32_t recovery_start_ts;
};
-/* pacing can be optionnaly activated on top of the algorithm */
+/* pacing can be optionally activated on top of the algorithm */
#define QUIC_CC_ALGO_FL_OPT_PACING 0x01
struct quic_cc_algo {
diff --git a/include/haproxy/quic_pacing-t.h b/include/haproxy/quic_pacing-t.h
index f910c78e0..77c82a2eb 100644
--- a/include/haproxy/quic_pacing-t.h
+++ b/include/haproxy/quic_pacing-t.h
@@ -5,7 +5,7 @@
#include <haproxy/quic_cc-t.h>
struct quic_pacer {
- const struct quic_cc *cc; /* Congestion controler algo used for this
connection */
+ const struct quic_cc *cc; /* Congestion controller algo used for this
connection */
ullong cur; /* Nanosecond timestamp of the last credit reloading */
uint credit; /* Number of packets which can be emitted in a single
burst */
diff --git a/include/haproxy/sc_strm.h b/include/haproxy/sc_strm.h
index 7c9fb8adf..37460703f 100644
--- a/include/haproxy/sc_strm.h
+++ b/include/haproxy/sc_strm.h
@@ -351,7 +351,7 @@ static inline void sc_sync_send(struct stconn *sc)
else if (sc_ep_test(sc, SE_FL_T_APPLET)) {
sc_applet_sync_send(sc);
if (sc_oc(sc)->flags & CF_WRITE_EVENT) {
- /* Data was send, wake the applet up. It is safe to do
so becasuse sc_applet_sync_send()
+ /* Data was send, wake the applet up. It is safe to do
so because sc_applet_sync_send()
* removes CF_WRITE_EVENT flag from the channel before
trying to send data to the applet.
*/
task_wakeup(__sc_appctx(sc)->t, TASK_WOKEN_OTHER);
diff --git a/include/haproxy/spoe-t.h b/include/haproxy/spoe-t.h
index 2b91d1403..de762fcdc 100644
--- a/include/haproxy/spoe-t.h
+++ b/include/haproxy/spoe-t.h
@@ -52,7 +52,7 @@
/* All supported SPOP actions */
enum spoe_action_type {
- SPOP_ACT_T_NOOP = 0, /* internal action for ampty ACK */
+ SPOP_ACT_T_NOOP = 0, /* internal action for an empty ACK */
SPOP_ACT_T_SET_VAR = 1,
SPOP_ACT_T_UNSET_VAR,
SPOP_ACT_TYPES,
diff --git a/include/import/cebtree-prv.h b/include/import/cebtree-prv.h
index cd8747296..0309e7891 100644
--- a/include/import/cebtree-prv.h
+++ b/include/import/cebtree-prv.h
@@ -63,7 +63,7 @@
* the same split bit as its parent node, it is necessary its associated leaf
*
* When descending along the tree, it is possible to know that a search key is
- * not present, because its XOR with both of the branches is stricly higher
+ * not present, because its XOR with both of the branches is strictly higher
* than the inter-branch XOR. The reason is simple : the inter-branch XOR will
* have its highest bit set indicating the split bit. Since it's the bit that
* differs between the two branches, the key cannot have it both set and
diff --git a/reg-tests/compression/basic.vtc b/reg-tests/compression/basic.vtc
index 5d9eadabd..78ca61b8d 100644
--- a/reg-tests/compression/basic.vtc
+++ b/reg-tests/compression/basic.vtc
@@ -271,7 +271,7 @@ client c1 -connect ${h1_fe_gzip_sock} {
expect resp.http.transfer-encoding == "<undef>"
expect resp.bodylen == 100
- # 7. Response alerady compressed by the server (with "Accept-Encoding")
+ # 7. Response already compressed by the server (with "Accept-Encoding")
txreq -url "/c1.7" \
-hdr "Accept-Encoding: gzip"
rxresp
diff --git a/src/activity.c b/src/activity.c
index 64ec5de93..51fea7e40 100644
--- a/src/activity.c
+++ b/src/activity.c
@@ -88,7 +88,7 @@ static void *memprof_realloc_initial_handler(void *ptr,
size_t size);
static char *memprof_strdup_initial_handler(const char *s);
static void memprof_free_initial_handler(void *ptr);
-/* these ones are optional but may be used by some dependecies */
+/* these ones are optional but may be used by some dependencies */
static char *memprof_strndup_initial_handler(const char *s, size_t n);
static void *memprof_valloc_initial_handler(size_t sz);
static void *memprof_pvalloc_initial_handler(size_t sz);
@@ -105,7 +105,7 @@ static void *(*memprof_realloc_handler)(void *ptr, size_t
size) = memprof_real
static char *(*memprof_strdup_handler)(const char *s) =
memprof_strdup_initial_handler;
static void (*memprof_free_handler)(void *ptr) =
memprof_free_initial_handler;
-/* these ones are optional but may be used by some dependecies */
+/* these ones are optional but may be used by some dependencies */
static char *(*memprof_strndup_handler)(const char *s, size_t n)
= memprof_strndup_initial_handler;
static void *(*memprof_valloc_handler)(size_t sz)
= memprof_valloc_initial_handler;
static void *(*memprof_pvalloc_handler)(size_t sz)
= memprof_pvalloc_initial_handler;
diff --git a/src/backend.c b/src/backend.c
index d27baad9d..a753a0ef4 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -457,7 +457,7 @@ struct server *get_server_hh(struct stream *s, const struct
server *avoid)
break;
}
else if (*p == '.') {
- /* The pointer is rewinded to the dot before the
+ /* The pointer is rewound to the dot before the
* tld, we memorize the end of the domain and
* can enter the domain processing. */
end = p;
diff --git a/src/cfgparse-global.c b/src/cfgparse-global.c
index 8e698ba1e..ba69ed1af 100644
--- a/src/cfgparse-global.c
+++ b/src/cfgparse-global.c
@@ -836,7 +836,7 @@ int cfg_parse_global(const char *file, int linenum, char
**args, int kwm)
continue;
if (strcmp(kwl->kw[index].kw, args[0]) == 0) {
- /* in MODE_DISCOVERY we read only the
keywords, which contains the appropiate flag */
+ /* in MODE_DISCOVERY we read only the
keywords, which contains the appropriate flag */
if ((global.mode & MODE_DISCOVERY) &&
((kwl->kw[index].flags & KWF_DISCOVERY) == 0 ))
goto out;
@@ -1626,7 +1626,7 @@ static int cfg_parse_global_chroot(char **args, int
section_type, struct proxy *
file, line, args[0], args[1],
strerror(errno));
else if (errno == EACCES)
ha_diag_warning("parsing [%s:%d]: '%s': '%s': %s "
- "(process is need to be started with
root priviledges to be able to chroot).\n",
+ "(process is need to be started with
root privileges to be able to chroot).\n",
file, line, args[0], args[1],
strerror(errno));
else
ha_diag_warning("parsing [%s:%d]: '%s': '%s': stat() is
failed: %s.\n",
diff --git a/src/cfgparse-quic.c b/src/cfgparse-quic.c
index 3b7c6df2e..115684e10 100644
--- a/src/cfgparse-quic.c
+++ b/src/cfgparse-quic.c
@@ -299,7 +299,7 @@ static int cfg_parse_quic_tune_setting(char **args, int
section_type,
if (strcmp(suffix, "cc.cubic.min-losses") == 0)
global.tune.quic_cubic_loss_tol = arg - 1;
else if (strcmp(suffix, "frontend.conn-tx-buffers.limit") == 0) {
- memprintf(err, "'%s' keyword is now obsolote and has no effect.
"
+ memprintf(err, "'%s' keyword is now obsolete and has no effect.
"
"Use
'tune.quic.frontend.default-max-window-size' to limit Tx buffer allocation per
connection.", args[0]);
return 1;
}
@@ -307,7 +307,7 @@ static int cfg_parse_quic_tune_setting(char **args, int
section_type,
global.tune.quic_frontend_glitches_threshold = arg;
else if (strcmp(suffix, "frontend.max-data-size") == 0) {
if ((errptr = parse_size_err(args[1], &arg))) {
- memprintf(err, "'%s': unexpected charater '%c' in size
argument '%s'.",
+ memprintf(err, "'%s': unexpected character '%c' in size
argument '%s'.",
args[0], *errptr, args[1]);
return -1;
}
diff --git a/src/cpu_topo.c b/src/cpu_topo.c
index 0d3354a6c..48837b1db 100644
--- a/src/cpu_topo.c
+++ b/src/cpu_topo.c
@@ -344,7 +344,7 @@ int _cmp_cpu_index(const void *a, const void *b)
if (l->idx > r->idx && r->idx >= 0)
return 1;
- /* exactly the same (e.g. absent, should not happend) */
+ /* exactly the same (e.g. absent, should not happen) */
return 0;
}
@@ -1355,7 +1355,7 @@ int cpu_detect_topology(void)
/* First, let's check the cache hierarchy. On systems exposing
* it, index0 generally is the L1D cache, index1 the L1I, index2
* the L2 and index3 the L3. But sometimes L1I/D are reversed,
- * and some CPUs also have L0 or L4. Maybe some heterogenous
+ * and some CPUs also have L0 or L4. Maybe some heterogeneous
* SoCs even have inconsistent levels between clusters... Thus
* we'll scan all entries that we can find for each CPU and
* assign levels based on what is reported. The types generally
diff --git a/src/haproxy.c b/src/haproxy.c
index 8b59bb6af..6888e886e 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -2550,7 +2550,7 @@ static void run_master_in_recovery_mode(int argc, char
**argv)
mworker_run_master();
}
-/* parse conf in disovery mode and set modes from config */
+/* parse conf in discovery mode and set modes from config */
static void read_cfg_in_discovery_mode(int argc, char **argv)
{
struct cfgfile *cfg, *cfg_tmp;
@@ -2604,7 +2604,7 @@ static void read_cfg_in_discovery_mode(int argc, char
**argv)
exit(EXIT_FAILURE);
}
- /* "progam" sections, if there are any, were alredy parsed only by
master
+ /* "program" sections, if there are any, were already parsed only by
master
* and programs are forked before calling postparser functions from
* postparser list. So, all checks related to "program" section
integrity
* and sections vs MODE_MWORKER combinations should be done here.
@@ -3242,7 +3242,7 @@ int main(int argc, char **argv)
if (backup_env() != 0)
exit(EXIT_FAILURE);
- /* parse conf in disovery mode and set modes from config */
+ /* parse conf in discovery mode and set modes from config */
read_cfg_in_discovery_mode(argc, argv);
/* From this stage all runtime modes are known. So let's do below some
@@ -3347,8 +3347,8 @@ int main(int argc, char **argv)
* forked. Thus the current worker inherits ipc_fd[0]s from the previous
* ones by it's parent, master, because we have to keep shared sockpair
* ipc_fd[0] always opened in master (master CLI server is listening on
- * this fd). It's safe to call close() at this point on these inhereted
- * ipc_fd[0]s, as they are inhereted after master re-exec unbound, we
+ * this fd). It's safe to call close() at this point on these inherited
+ * ipc_fd[0]s, as they are inherited after master re-exec unbound, we
* keep them like this during bind_listeners() call. So, these fds were
* never referenced in the current worker's fdtab.
*/
@@ -3404,7 +3404,7 @@ int main(int argc, char **argv)
}
/* applies the renice value in the worker or standalone after
configuration parsing
- * but before chaning identity */
+ * but before changing identity */
if (!master && global.tune.renice_runtime) {
if (setpriority(PRIO_PROCESS, 0, global.tune.renice_runtime -
100) == -1) {
ha_warning("[%s.main()] couldn't set the runtime nice
value to %d: %s\n",
diff --git a/src/hlua.c b/src/hlua.c
index b9fee5f3c..9bbc0bf5f 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -610,7 +610,7 @@ static unsigned int hlua_nb_instruction = 0;
*
* configured | Number of
* instructions | loops executed
- * between two | in milions
+ * between two | in millions
* forced yields |
* ---------------+---------------
* 10 | 160
diff --git a/src/http_act.c b/src/http_act.c
index a24f5fe30..0bb616518 100644
--- a/src/http_act.c
+++ b/src/http_act.c
@@ -41,7 +41,7 @@
#include <haproxy/version.h>
-/* Release memory allocated by most of HTTP actions. Concretly, it releases
+/* Release memory allocated by most of HTTP actions. Concretely, it releases
* <arg.http>.
*/
static void release_http_action(struct act_rule *rule)
@@ -52,7 +52,7 @@ static void release_http_action(struct act_rule *rule)
lf_expr_deinit(&rule->arg.http.fmt);
}
-/* Release memory allocated by HTTP actions relying on an http reply.
Concretly,
+/* Release memory allocated by HTTP actions relying on an http reply.
Concretely,
* it releases <.arg.http_reply>
*/
static void release_act_http_reply(struct act_rule *rule)
diff --git a/src/http_ext.c b/src/http_ext.c
index f74f1af90..32399bfdf 100644
--- a/src/http_ext.c
+++ b/src/http_ext.c
@@ -1882,8 +1882,8 @@ static int sample_conv_7239_n2np(const struct arg *args,
struct sample *smp, voi
/*
* input: ipv4 address, ipv6 address or str (empty string will result in
- * "unknown" indentifier, else string will be translated to _obfs
- * indentifier, prefixed by '_'. Must comply with RFC7239 charset)
+ * "unknown" identifier, else string will be translated to _obfs
+ * identifier, prefixed by '_'. Must comply with RFC7239 charset)
*
* output: rfc7239-compliant forwarded header nodename
*/
@@ -1938,7 +1938,7 @@ static int sample_conv_7239_nn(const struct arg *args,
struct sample *smp, void
/*
* input: unsigned integer or str (string will be translated to _obfs
- * indentifier, prefixed by '_'. Must comply with RFC7239 charset)
+ * identifier, prefixed by '_'. Must comply with RFC7239 charset)
*
* output: rfc7239-compliant forwarded header nodeport
*/
diff --git a/src/jws.c b/src/jws.c
index 731e6ad46..feb03d718 100644
--- a/src/jws.c
+++ b/src/jws.c
@@ -454,7 +454,7 @@ int jws_b64_signature(EVP_PKEY *pkey, enum jwt_alg alg,
char *b64protected, char
const BIGNUM *r = NULL, *s = NULL;
int bignum_len;
- /* need to pad to byte size, essentialy for P-521 */
+ /* need to pad to byte size, essentially for P-521 */
bignum_len = (EVP_PKEY_bits(pkey) + 7) / 8;
if ((sig = d2i_ECDSA_SIG(NULL, (const unsigned char
**)&sign->area, sign->data)) == NULL)
diff --git a/src/mux_h1.c b/src/mux_h1.c
index bf7fbaca5..3412e76b6 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -660,7 +660,7 @@ static inline void h1c_report_term_evt(struct h1c *h1c,
enum muxc_term_event_typ
}
/* Returns 1 if the H1 connection is alive (IDLE, EMBRYONIC, RUNNING or
- * DRAINING). Ortherwise 0 is returned.
+ * DRAINING). Otherwise 0 is returned.
*/
static inline int h1_is_alive(const struct h1c *h1c)
{
diff --git a/src/mux_h2.c b/src/mux_h2.c
index 948ae26d3..7195c1599 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -5834,7 +5834,7 @@ static int h2c_dec_hdrs(struct h2c *h2c, struct buffer
*rxbuf, uint32_t *flags,
if ((unsigned)hdr.len > (unsigned)global.tune.bufsize) {
/* RFC7540#4.2: invalid frame length */
h2c_report_glitch(h2c, 1, "too large CONTINUATION
frame");
- TRACE_STATE("too large CONTIUATION frame",
H2_EV_RX_FRAME|H2_EV_RX_FHDR|H2_EV_RX_HDR|H2_EV_RX_CONT|H2_EV_H2C_ERR|H2_EV_PROTO_ERR,
h2c->conn);
+ TRACE_STATE("too large CONTINUATION frame",
H2_EV_RX_FRAME|H2_EV_RX_FHDR|H2_EV_RX_HDR|H2_EV_RX_CONT|H2_EV_H2C_ERR|H2_EV_PROTO_ERR,
h2c->conn);
h2c_error(h2c, H2_ERR_FRAME_SIZE_ERROR);
goto fail;
}
diff --git a/src/mux_quic.c b/src/mux_quic.c
index 5d76677e3..eb6367b27 100644
--- a/src/mux_quic.c
+++ b/src/mux_quic.c
@@ -1529,7 +1529,7 @@ static void _qcc_send_stream(struct qcs *qcs, int urg)
qcc_clear_frms(qcc);
if (urg) {
- /* qcc_emit_rs_ss() relies on resetted/aborted streams in
send_list front. */
+ /* qcc_emit_rs_ss() relies on reset/aborted streams in
send_list front. */
BUG_ON(!(qcs->flags &
(QC_SF_TO_RESET|QC_SF_TO_STOP_SENDING|QC_SF_TXBUB_OOB)));
LIST_DEL_INIT(&qcs->el_send);
@@ -2637,7 +2637,7 @@ static int qcc_emit_rs_ss(struct qcc *qcc)
*
* This functions also serves to emit RESET_STREAM and STOP_SENDING frames. In
* this case, frame is emitted immediately without using <qcc> tx frms. If an
- * error occured during this step, this is considered as fatal. Tx frms is
+ * error occurred during this step, this is considered as fatal. Tx frms is
* cleared and 0 is returned.
*
* Returns the sum of encoded payload STREAM frames length. Note that 0 can be
diff --git a/src/proto_quic.c b/src/proto_quic.c
index 26b2fda99..a0e9812c7 100644
--- a/src/proto_quic.c
+++ b/src/proto_quic.c
@@ -795,7 +795,7 @@ static int quic_test_gso(void)
* mechanism. A message is notified in this case when running in diagnostic
* mode.
*
- * Returns ERR_NONE if every checks performed, wether or not some features are
+ * Returns ERR_NONE if every checks performed, whether or not some features are
* not available. ERR_FATAL is reported if checks cannot be executed.
*/
static int quic_test_socketopts(void)
diff --git a/src/proxy.c b/src/proxy.c
index 67807d7e7..13be57e40 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -1936,7 +1936,7 @@ static int proxy_defproxy_cpy(struct proxy *curproxy,
const struct proxy *defpro
/* defproxy is const pointer, so we need to typecast log_steps to
* drop the const in order to use EB tree API, please note however
- * that the operations performed below should theorically be read-only
+ * that the operations performed below should theoretically be read-only
*/
node = eb32_first((struct eb_root *)&defproxy->conf.log_steps);
while (node) {
diff --git a/src/queue.c b/src/queue.c
index 4af08d123..62832f07a 100644
--- a/src/queue.c
+++ b/src/queue.c
@@ -413,7 +413,7 @@ int process_srv_queue(struct server *s)
*
* We'll dequeue MAX_SELF_USE_QUEUE items from the queue corresponding
* to our thread group, then we'll get one from a different one, to
- * be sure those actually get processsed too.
+ * be sure those actually get processed too.
*/
while (non_empty_tgids != 0
&& (done < global.tune.maxpollevents || !s->served) &&
diff --git a/src/quic_cc_bbr.c b/src/quic_cc_bbr.c
index f1e426297..9f686b983 100644
--- a/src/quic_cc_bbr.c
+++ b/src/quic_cc_bbr.c
@@ -256,7 +256,7 @@ struct bbr {
* The camelcase naming convention is used by the BBR RFC for the function
names
* and constants. To helps in matching the code below with the RFC one, note
* that all the function names have been translated this way. The uppercase
- * letters have been replaced by lowercase letters. The words have been
seperated
+ * letters have been replaced by lowercase letters. The words have been
separated
* by underscores as follows:
*
* ex: BBRMinPipeCwnd() -> bbr_min_pipe_cwnd()
diff --git a/src/quic_conn.c b/src/quic_conn.c
index 77f28a4f2..e636087c4 100644
--- a/src/quic_conn.c
+++ b/src/quic_conn.c
@@ -830,9 +830,9 @@ struct task *quic_conn_io_cb(struct task *t, void *context,
unsigned int state)
/* Note: if no token for address validation was received
* for a 0RTT connection, some 0RTT packet could still be
* waiting for HP removal AFTER the successful handshake
completion.
- * Indeed a successful handshake completion implicitely valids
+ * Indeed a successful handshake completion implicitly valids
* the peer address. In this case, one wants to process
- * these ORTT packets AFTER the succesful handshake completion.
+ * these ORTT packets AFTER the successful handshake completion.
*
* On the contrary, when a token for address validation was
received,
* release 0RTT packets still waiting for HP removal. These
diff --git a/src/quic_rx.c b/src/quic_rx.c
index 27eebec0d..94888f02e 100644
--- a/src/quic_rx.c
+++ b/src/quic_rx.c
@@ -205,7 +205,7 @@ static int qc_pkt_decrypt(struct quic_conn *qc, struct
quic_enc_level *qel,
/* Handle <frm> frame whose packet it is attached to has just been
acknowledged. The memory allocated
* for this frame will be at least released in every cases.
*
- * Returns 1 on sucess else 0.
+ * Returns 1 on success else 0.
*/
static int qc_handle_newly_acked_frm(struct quic_conn *qc, struct quic_frame
*frm)
{
@@ -311,7 +311,7 @@ static void qc_newly_acked_pkts(struct quic_conn *qc,
struct eb_root *pkts,
/* Handle <newly_acked_pkts> list of newly acknowledged TX packets.
*
- * Returns 1 on sucess else 0.
+ * Returns 1 on success else 0.
*/
static int qc_handle_newly_acked_pkts(struct quic_conn *qc,
unsigned int *pkt_flags, struct list
*newly_acked_pkts)
diff --git a/src/quic_stream.c b/src/quic_stream.c
index 293a2457a..71988c15d 100644
--- a/src/quic_stream.c
+++ b/src/quic_stream.c
@@ -128,7 +128,7 @@ void qc_stream_desc_release(struct qc_stream_desc *stream,
if (final_size < tail_offset)
b_sub(buf, tail_offset - final_size);
- /* Release active buffer, or delete it immediatly if there is
+ /* Release active buffer, or delete it immediately if there is
* no data to acknowledge. Both functions will reset active
* buf pointer and invoke <notify_room> if necessary.
*/
@@ -243,7 +243,7 @@ static int qc_stream_buf_store_ack(struct qc_stream_buf
*buf,
}
/* Acknowledges data for buffer <buf> attached to <stream> instance. This
covers
- * the range strating at <offset> and of length <len>, with <fin> sets for the
+ * the range starting at <offset> and of length <len>, with <fin> sets for the
* last stream frame.
*
* Returns <buf> if there is still data to acknowledge or buffered ACK to
@@ -495,7 +495,7 @@ struct buffer *qc_stream_buf_realloc(struct qc_stream_desc
*stream)
/* This function is reserved to convert a big buffer to a smaller one.
*/
BUG_ON(!stream->buf || !stream->buf->sbuf);
- /* This function can only be used if targetted buffer is empty. */
+ /* This function can only be used if targeted buffer is empty. */
BUG_ON(b_data(&stream->buf->buf));
/* Release buffer */
diff --git a/src/quic_tx.c b/src/quic_tx.c
index 06f851b4d..919fb1282 100644
--- a/src/quic_tx.c
+++ b/src/quic_tx.c
@@ -153,7 +153,7 @@ struct buffer *qc_get_txb(struct quic_conn *qc)
/* Commit a datagram payload written into <buf> of length <length>. <first_pkt>
* must contains the address of the first packet stored in the payload. When
- * GSO is used, several datagrams can be commited at once. In this case,
+ * GSO is used, several datagrams can be committed at once. In this case,
* <length> must be the total length of all consecutive datagrams.
*
* Caller is responsible that there is enough space in the buffer.
@@ -1856,7 +1856,7 @@ static int qc_do_build_pkt(unsigned char *pos, const
unsigned char *end,
* its frames which were already acknowledeged.
* See qc_stream_frm_is_acked()) called by
qc_build_frms().
* Note that qc_stream_frm_is_acked() logs a
trace in this
- * case mentionning some frames were already
acknowledged.
+ * case mentioning some frames were already
acknowledged.
*
* That said, the consequence must be the same:
cancelling
* the packet build as if there was not enough
room in the
diff --git a/src/sample.c b/src/sample.c
index ab44bfecc..1e2ff7d2e 100644
--- a/src/sample.c
+++ b/src/sample.c
@@ -3619,7 +3619,7 @@ static int smp_check_concat(struct arg *args, struct
sample_conv *conv,
}
/* Append delimiter (only to a non empty input) followed by the optional
- * variable contents concatenated with the optional sufix.
+ * variable contents concatenated with the optional suffix.
*/
static int sample_conv_add_item(const struct arg *arg_p, struct sample *smp,
void *private)
{
diff --git a/src/sink.c b/src/sink.c
index a12fe51d4..f34974664 100644
--- a/src/sink.c
+++ b/src/sink.c
@@ -676,7 +676,7 @@ static struct task *process_sink_forward(struct task *
task, void *context, unsi
while (sft) {
HA_SPIN_LOCK(SFT_LOCK, &sft->lock);
/* If appctx is NULL, start a new session and perform
the appctx
- * assigment right away since the applet is not
supposed to change
+ * assignment right away since the applet is not
supposed to change
* during the session lifetime. By doing the assignment
now we
* make sure to start the session exactly once.
*
diff --git a/src/sock.c b/src/sock.c
index feb052691..c6419a6da 100644
--- a/src/sock.c
+++ b/src/sock.c
@@ -957,7 +957,7 @@ int sock_conn_check(struct connection *conn)
*
* We have no explanation for now. Why epoll report the
* connection is closed while the connect() it able to validate
- * it ? no idea. But, it seems reasonnable in this case, and if
+ * it ? no idea. But, it seems reasonable in this case, and if
* no error was reported, to remove the the HUP flag. At worst,
if
* the connection is really closed, this will be reported later.
*
diff --git a/src/ssl_ckch.c b/src/ssl_ckch.c
index f5c893e57..30cef00d1 100644
--- a/src/ssl_ckch.c
+++ b/src/ssl_ckch.c
@@ -1604,7 +1604,7 @@ static void cli_release_show_sni(struct appctx *appctx)
/* IO handler of "show ssl sni [<frontend>]".
* It makes use of a show_sni_ctx context
*
- * The fonction does loop over the frontend, the bind_conf and the sni_ctx.
+ * The function does loop over the frontend, the bind_conf and the sni_ctx.
*/
static int cli_io_handler_show_sni(struct appctx *appctx)
{
@@ -1652,7 +1652,7 @@ static int cli_io_handler_show_sni(struct appctx *appctx)
else
n =
ebmb_first(&bind->sni_w_ctx);
}
- /* emty SNI tree, skip */
+ /* empty SNI tree, skip */
if (!n)
continue;
diff --git a/src/stats-proxy.c b/src/stats-proxy.c
index c1e42facd..d68a17b0f 100644
--- a/src/stats-proxy.c
+++ b/src/stats-proxy.c
@@ -96,7 +96,7 @@ const struct stat_col stat_cols_px[ST_I_PX_MAX] = {
[ST_I_PX_HANAFAIL] = ME_NEW_BE("hanafail", NULL,
FN_COUNTER, FF_U64, failed_hana,
STATS_PX_CAP____S, "Total number of failed checks caused by an 'on-error'
directive after an 'observe' condition matched"),
[ST_I_PX_REQ_RATE] = ME_NEW_FE("req_rate", NULL,
FN_RATE, FF_U32, req_per_sec,
STATS_PX_CAP__F__, "Number of HTTP requests processed over the last second on
this object"),
[ST_I_PX_REQ_RATE_MAX] = { .name = "req_rate_max",
.alt_name = "http_requests_rate_max", .desc = "Highest
value of http requests observed since the worker process started", .cap =
STATS_PX_CAP__F__ },
- /* Note: ST_I_PX_REQ_TOT is also diplayed on frontend but does not uses
a raw counter value, see me_generate_field() for details. */
+ /* Note: ST_I_PX_REQ_TOT is also displayed on frontend but does not
uses a raw counter value, see me_generate_field() for details. */
[ST_I_PX_REQ_TOT] = ME_NEW_BE("req_tot",
"http_requests_total", FN_COUNTER, FF_U64, p.http.cum_req,
STATS_PX_CAP__FBS, "Total number of HTTP requests processed by this object
since the worker process started"),
[ST_I_PX_CLI_ABRT] = ME_NEW_BE("cli_abrt",
"client_aborts_total", FN_COUNTER, FF_U64, cli_aborts,
STATS_PX_CAP___BS, "Total number of requests or connections aborted by the
client since the worker process started"),
[ST_I_PX_SRV_ABRT] = ME_NEW_BE("srv_abrt",
"server_aborts_total", FN_COUNTER, FF_U64, srv_aborts,
STATS_PX_CAP___BS, "Total number of requests or connections aborted by the
server since the worker process started"),
@@ -269,7 +269,7 @@ static struct field me_generate_field(const struct stat_col
*col,
}
/* TODO Special case needed for ST_I_PX_REQ_TOT. It is defined as a
- * generic column for backend side. Extra code required to diplay it on
+ * generic column for backend side. Extra code required to display it on
* frontend side as an aggregate of values split by HTTP version.
*/
if (idx == ST_I_PX_REQ_TOT && cap == STATS_PX_CAP_FE && !stat_file) {
diff --git a/src/stick_table.c b/src/stick_table.c
index d143c5e87..bb73e5f69 100644
--- a/src/stick_table.c
+++ b/src/stick_table.c
@@ -162,7 +162,7 @@ int __stksess_kill(struct stktable *t, struct stksess *ts)
}
/*
- * Decrease the refcount of a stksess and relase it if the refcount falls to 0.
+ * Decrease the refcount of a stksess and release it if the refcount falls to
0.
* Returns non-zero if deleted, zero otherwise.
*
* This function locks the corresponding table shard to proceed. When this
diff --git a/src/tools.c b/src/tools.c
index 5cd89be9f..7bffe5b07 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -5576,7 +5576,7 @@ const void *resolve_sym_name(struct buffer *buf, const
char *pfx, const void *ad
}
}
- /* if that's an exact match, no need to call dl_addr. This happends
+ /* if that's an exact match, no need to call dl_addr. This happens
* when showing callback pointers for example, but not in backtraces.
*/
if (!best_dist)
--
2.46.0.windows.1
