CLEANUP: assorted typo fixes in the code and comments

This is 35th iteration of typo fixes

diff --git a/doc/SPOE.txt b/doc/SPOE.txt
index 9a4cc4b5c5eb5bad07492a7b60a02f8bb50b83bd..2001c1fa049e48251b3908a2104ef7ed34ca576d 100644 (file)
--- a/doc/SPOE.txt
+++ b/doc/SPOE.txt
@@ -230,7 +230,7 @@ max-frame-size <number>
 
 max-waiting-frames <number>
   Set the maximum number of frames waiting for an acknowledgement on the same
-  connection. This value is only used when the pipelinied or asynchronus
+  connection. This value is only used when the pipelinied or asynchronous
   exchanges between HAProxy and SPOA are enabled. By default, it is set to 20.
 
 messages <msg-name> ...
@@ -248,7 +248,7 @@ messages <msg-name> ...
 
 option async
 no option async
-  Enable or disable the support of asynchronus exchanges between HAProxy and
+  Enable or disable the support of asynchronous exchanges between HAProxy and
   SPOA. By default, this option is enabled.
 
 

diff --git a/doc/configuration.txt b/doc/configuration.txt
index e236f0a87ca31a3e45e86fad58f37d6602fb71aa..586689ca2111a0e7c5fb9bcd68766be1ce71b34c 100644 (file)
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -3390,7 +3390,7 @@ tune.ssl.ocsp-update.mindelay <number>
 tune.stick-counters <number>
   Sets the number of stick-counters that may be tracked at the same time by a
   connection or a request via "track-sc*" actions in "tcp-request" or
-  "http-request" rules. The defaut value is set at build time by the macro
+  "http-request" rules. The default value is set at build time by the macro
   MAX_SESS_STK_CTR, and defaults to 3. With this setting it is possible to
   change the value and ignore the one passed at build time. Increasing this
   value may be needed when porting complex configurations to haproxy, but users
@@ -9175,7 +9175,7 @@ no option forwarded
                     those result will be used as 'for' parameter nodeport value
 
 
-  Since HAProxy works in reverse-proxy mode, servers are loosing some request
+  Since HAProxy works in reverse-proxy mode, servers are losing some request
   context (request origin: client ip address, protocol used...)
 
   A common way to address this limitation is to use the well known
@@ -9189,7 +9189,7 @@ no option forwarded
   forwarded header (RFC7239).
   More information here: https://www.rfc-editor.org/rfc/rfc7239.html
 
-  The use of this single header allow to convey multiple informations
+  The use of this single header allow to convey numerous details
   within the same header, and most importantly, fixes the proxy chaining
   issue. (the rfc allows for multiple chained proxies to append their own
   values to an already existing header).

diff --git a/include/haproxy/htx.h b/include/haproxy/htx.h
index 339f0a559e84045c95835d504b9129d6c5172894..e80ecad68f8754cd4cd6768843ec272029bd6d9b 100644 (file)
--- a/include/haproxy/htx.h
+++ b/include/haproxy/htx.h
@@ -30,7 +30,7 @@
 #include <haproxy/http-t.h>
 #include <haproxy/htx-t.h>
 
-/* ->extra field value when the payload lenght is unknown (non-chunked message
+/* ->extra field value when the payload length is unknown (non-chunked message
  * with no "Content-length" header)
  */
 #define HTX_UNKOWN_PAYLOAD_LENGTH ULLONG_MAX

diff --git a/include/haproxy/quic_frame-t.h b/include/haproxy/quic_frame-t.h
index 58feb444b8f2f4cca8822a8440c87c1a3bad8b54..b04d0e2d9ff7a1446e1552265b22991eb95ee2b1 100644 (file)
--- a/include/haproxy/quic_frame-t.h
+++ b/include/haproxy/quic_frame-t.h
@@ -270,7 +270,7 @@ struct quic_frame {
        struct list reflist;        /* List head containing duplicated children frames. */
        struct list ref;            /* List elem from parent frame reflist. Set if frame is a duplicate (used for retransmission). */
        unsigned int flags;         /* QUIC_FL_TX_FRAME_* */
-       unsigned int loss_count;    /* Counter for each occurence of this frame marked as lost. */
+       unsigned int loss_count;    /* Counter for each occurrence of this frame marked as lost. */
 };
 
 

diff --git a/include/haproxy/quic_frame.h b/include/haproxy/quic_frame.h
index cf489f759ba431c21b5e9f81f0a319e86fe8e4de..aae45c9c7e304936217f9b7a8b5134dc8262cd26 100644 (file)
--- a/include/haproxy/quic_frame.h
+++ b/include/haproxy/quic_frame.h
@@ -204,7 +204,7 @@ static inline struct quic_frame *qc_frm_alloc(int type)
 
 /* Allocate a quic_frame by duplicating <origin> frame. This will create a new
  * frame of the same type with the same content. Internal fields such as packet
- * owner and flags are however resetted for the newly allocated frame except
+ * owner and flags are however reset for the newly allocated frame except
  * for the loss counter. Frame must be freed with qc_frm_free().
  *
  * Returns the allocated frame or NULL on failure.

diff --git a/include/haproxy/spoe-t.h b/include/haproxy/spoe-t.h
index 197f47b7fdee70f0f38a973ec15eb7e696f0fa2b..dcc217115a0c7b8e58fa3133fbb668bd27f269bf 100644 (file)
--- a/include/haproxy/spoe-t.h
+++ b/include/haproxy/spoe-t.h
@@ -57,7 +57,7 @@
 
 /* Flags set on the SPOE applet */
 #define SPOE_APPCTX_FL_PIPELINING    0x00000001 /* Set if pipelining is supported */
-#define SPOE_APPCTX_FL_ASYNC         0x00000002 /* Set if asynchronus frames is supported */
+#define SPOE_APPCTX_FL_ASYNC         0x00000002 /* Set if asynchronous frames is supported */
 #define SPOE_APPCTX_FL_FRAGMENTATION 0x00000004 /* Set if fragmentation is supported */
 
 #define SPOE_APPCTX_ERR_NONE    0x00000000 /* no error yet, leave it to zero */

diff --git a/include/haproxy/spoe.h b/include/haproxy/spoe.h
index 8e123e30498460ef489279f09e2ac50894116969..7cd09872c33ee2e67be208a8befaef2638bdd4f6 100644 (file)
--- a/include/haproxy/spoe.h
+++ b/include/haproxy/spoe.h
@@ -165,7 +165,7 @@ spoe_encode_data(struct sample *smp, char **buf, char *end)
                         * context. ctx.a[0] is the pointer to the length and ctx.a[1] is the
                         * pointer to the offset. If the offset is greater than 0, it means the
                         * sample is partially encoded. In this case, we only need to encode the
-                        * reamining. When all the sample is encoded, the offset is reset to 0.
+                        * remaining. When all the sample is encoded, the offset is reset to 0.
                         * So the caller know it can try to encode the next sample. */
                        struct buffer *chk = &smp->data.u.str;
                        unsigned int *len  = smp->ctx.a[0];

diff --git a/include/haproxy/stconn-t.h b/include/haproxy/stconn-t.h
index 8baf965acdd5a794c6386156ab7dda4292737abd..be6e3a02d3fbdb6653cc215e2657a9e3e520cf0c 100644 (file)
--- a/include/haproxy/stconn-t.h
+++ b/include/haproxy/stconn-t.h
@@ -204,7 +204,7 @@ struct stconn;
  * <flags>  SE_FL_*
  *
  * <lra> should be updated when a read activity is detected. It can be a
- *       sucessful receive, when a shutr is reported or when receives are
+ *       successful receive, when a shutr is reported or when receives are
  *       unblocked.
 
  * <fsb> should be updated when the first send of a series is blocked and reset

diff --git a/src/http_act.c b/src/http_act.c
index fb77f801b210e204b7a0343c7b06eda293afceba..737d6d8bad4be205a3aa6c3947529d09b38bee95 100644 (file)
--- a/src/http_act.c
+++ b/src/http_act.c
@@ -1379,7 +1379,7 @@ static enum act_return http_action_early_hint(struct act_rule *rule, struct prox
                s->txn->status = 103;
        }
 
-       /* Add the HTTP Early Hint HTTP 103 response heade */
+       /* Add the HTTP Early Hint HTTP 103 response header */
        value->data = build_logline(s, b_tail(value), b_room(value), &rule->arg.http.fmt);
        if (!htx_add_header(htx, rule->arg.http.str, ist2(b_head(value), b_data(value))))
                goto error;

diff --git a/src/http_conv.c b/src/http_conv.c
index f33336aae453b70c4d67e2a451d57a8c1d9fdd39..cf515a877d765e440985b716aabcba9be57076ac 100644 (file)
--- a/src/http_conv.c
+++ b/src/http_conv.c
@@ -354,7 +354,7 @@ static int smp_conv_req_capture(const struct arg *args, struct sample *smp, void
        fe = strm_fe(smp->strm);
        idx = args->data.sint;
 
-       /* Check the availibity of the capture id. */
+       /* Check the availability of the capture id. */
        if (idx > fe->nb_req_cap - 1)
                return 0;
 
@@ -399,7 +399,7 @@ static int smp_conv_res_capture(const struct arg *args, struct sample *smp, void
        fe = strm_fe(smp->strm);
        idx = args->data.sint;
 
-       /* Check the availibity of the capture id. */
+       /* Check the availability of the capture id. */
        if (idx > fe->nb_rsp_cap - 1)
                return 0;
 

diff --git a/src/http_ext.c b/src/http_ext.c
index 20a1e38b3988851aa810f8c2612b961c00388b2e..d1bae9c2ab5c48416010b8af5a48b6ce19cc8982 100644 (file)
--- a/src/http_ext.c
+++ b/src/http_ext.c
@@ -166,7 +166,7 @@ static inline int http_7239_extract_ipv6(struct ist *input, struct in6_addr *ip)
 /* checks if <input> contains rfc7239 compliant host
  * <quoted> is used to determine if the current input is being extracted
  * from a quoted (non zero) or unquoted (zero) token, as the parsing rules
- * differ wheteher the input is quoted or not according to the rfc.
+ * differ whether the input is quoted or not according to the rfc.
  * Returns 1 for success and 0 for failure
  * if <host> is not NULL, it will be set to the extracted value contained
  * in <input>
@@ -213,7 +213,7 @@ static inline int http_7239_extract_host(struct ist *input, struct ist *host, in
 /* checks if <input> contains rfc7239 compliant nodename
  * <quoted> is used to determine if the current input is being extracted
  * from a quoted (non zero) or unquoted (zero) token, as the parsing rules
- * differ wheteher the input is quoted or not according to the rfc.
+ * differ whether the input is quoted or not according to the rfc.
  * Returns 1 for success and 0 for failure
  * if <nodename> is not NULL, it will be set to the extracted value contained
  * in <input>
@@ -279,7 +279,7 @@ static inline int http_7239_extract_nodename(struct ist *input, struct forwarded
 /* checks if <input> contains rfc7239 compliant nodeport
  * <quoted> is used to determine if the current input is being extracted
  * from a quoted (non zero) or unquoted (zero) token, as the parsing rules
- * differ wheteher the input is quoted or not according to the rfc.
+ * differ whether the input is quoted or not according to the rfc.
  * Returns 1 for success and 0 for failure
  * if <nodeport> is not NULL, it will be set to the extracted value contained
  * in <input>
@@ -317,7 +317,7 @@ static inline int http_7239_extract_nodeport(struct ist *input, struct forwarded
 /* checks if <input> contains rfc7239 compliant node (nodename:nodeport token)
  * <quoted> is used to determine if the current input is being extracted
  * from a quoted (non zero) or unquoted (zero) token, as the parsing rules
- * differ wheteher the input is quoted or not according to the rfc.
+ * differ whether the input is quoted or not according to the rfc.
  * Returns 1 for success and 0 for failure
  * if <node> is not NULL, it will be set to the extracted value contained
  * in <input>
@@ -651,7 +651,7 @@ static inline void http_build_7239_header_host(struct buffer *out,
                {
                        struct ist validate = ist2(str, str_len);
                        /* host check, to ensure rfc compliant output
-                        * (assumming host is quoted/escaped)
+                        * (assuming host is quoted/escaped)
                         */
                        if (http_7239_extract_host(&validate, NULL, 1) && !istlen(validate))
                                chunk_memcat(out, str, str_len);
@@ -689,7 +689,7 @@ static int http_build_7239_header(struct buffer *out,
                        ((conn_is_ssl(cli_conn)) ? "https" : "http"));
        }
        if (curproxy->http_ext->fwd->p_host.mode) {
-               /* always add quotes for host parameter to make output compliancy checks simpler */
+               /* always add quotes for host parameter to make output compliance checks simpler */
                chunk_appendf(out, "%shost=\"", ((out->data) ? ";" : ""));
                /* ignore return value for now, but could be useful some day */
                http_build_7239_header_host(out, s, curproxy, htx, &curproxy->http_ext->fwd->p_host);
@@ -1676,7 +1676,7 @@ void http_ext_softclean(struct proxy *curproxy)
        }
 }
 
-/* Perform some consitency checks on px.http_ext after parsing
+/* Perform some consistency checks on px.http_ext after parsing
  * is completed.
  * We make sure to perform a softclean in case some options were
  * to be disabled in this check. This way we can release some memory.

diff --git a/src/mux_h2.c b/src/mux_h2.c
index a76293e8c590ddb4031d728bc6e3c0c19b0546a5..7c553ad8274064daf9bdcc719d77fd57e9368489 100644 (file)
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -845,7 +845,7 @@ static int h2_avail_streams(struct connection *conn)
        return ret1;
 }
 
-/* inconditionally produce a trace of the header. Please do not call this one
+/* Unconditionally produce a trace of the header. Please do not call this one
  * and use h2_trace_header() instead which first checks if traces are enabled.
  */
 void _h2_trace_header(const struct ist hn, const struct ist hv,

diff --git a/src/mux_quic.c b/src/mux_quic.c
index b2e1e32ce9836ee5a2d6df1b985ba29b19bfc4ab..291f4b3bbb633fed387429a4383b4eda7a0482e0 100644 (file)
--- a/src/mux_quic.c
+++ b/src/mux_quic.c
@@ -58,7 +58,7 @@ static void qc_free_ncbuf(struct qcs *qcs, struct ncbuf *ncbuf)
 
 /* Free <qcs> instance. This function is reserved for internal usage : it must
  * only be called on qcs alloc error or on connection shutdown. Else
- * qcs_destroy must be prefered to handle QUIC flow-control increase.
+ * qcs_destroy must be preferred to handle QUIC flow-control increase.
  */
 static void qcs_free(struct qcs *qcs)
 {

diff --git a/src/quic_conn.c b/src/quic_conn.c
index f6d9a684acaaa41adba960c9e9ccfd00f4186911..2da4165681eb0fa7428c5d306979261ae607c171 100644 (file)
--- a/src/quic_conn.c
+++ b/src/quic_conn.c
@@ -2319,7 +2319,7 @@ int ssl_sock_get_alpn(const struct connection *conn, void *xprt_ctx,
  * MUST be called after having received the remote transport parameters which
  * are parsed when the TLS callback for the ClientHello message is called upon
  * SSL_do_handshake() calls, not necessarily at the first time as this TLS
- * message may be splitted between packets
+ * message may be split between packets
  * Return 1 if succeeded, 0 if not.
  */
 static int qc_conn_finalize(struct quic_conn *qc, int server)
@@ -2781,7 +2781,7 @@ static void qc_cc_err_count_inc(struct quic_conn *qc, struct quic_frame *frm)
  * TODO this function is closely related to H3. Its place should be in H3 layer
  * instead of quic-conn but this requires an architecture adjustment.
  *
- * Returns 1 on sucess else 0.
+ * Returns 1 on success else 0.
  */
 static int qc_h3_request_reject(struct quic_conn *qc, uint64_t id)
 {

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 801543cb7786df9016aaf01db6b3ece2d5b2f389..ee6183a65539d8970823a826ced4b3204b1966c7 100644 (file)
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -3478,7 +3478,7 @@ static int ssl_sock_put_ckch_into_ctx(const char *path, struct ckch_data *data,
        /* Load OCSP Info into context
         * If OCSP update mode is set to 'on', an entry will be created in the
         * ocsp tree even if no ocsp_response was known during init, unless the
-        * frontend's conf disables ocsp update explicitely.
+        * frontend's conf disables ocsp update explicitly.
         */
        if (ssl_sock_load_ocsp(path, ctx, data, find_chain) < 0) {
                if (data->ocsp_response)

diff --git a/src/stconn.c b/src/stconn.c
index f84ae6a0f5ea6f5019dec8d33b270c598a59a87e..1e796c2642847a719e1503044e212c70c341ecc9 100644 (file)
--- a/src/stconn.c
+++ b/src/stconn.c
@@ -501,7 +501,7 @@ struct appctx *sc_applet_create(struct stconn *sc, struct applet *app)
        return appctx;
 }
 
-/* Conditionnaly forward the close to the wirte side. It return 1 if it can be
+/* Conditionally forward the close to the write side. It return 1 if it can be
  * forwarded. It is the caller responsibility to forward the close to the write
  * side. Otherwise, 0 is returned. In this case, CF_SHUTW_NOW flag may be set on
  * the channel if we are only waiting for the outgoing data to be flushed.

diff --git a/src/thread.c b/src/thread.c
index 7a4307ee5a1d1ba1217c4c3f45b8581a3fa6b214..d11df8df06e659388cdfdbc9a4094b835110d5a5 100644 (file)
--- a/src/thread.c
+++ b/src/thread.c
@@ -1452,7 +1452,7 @@ int parse_thread_set(const char *arg, struct thread_set *ts, char **err)
                }
                else {
                        if (sep != set && *sep && *sep != '-' && *sep != ',') {
-                               // Only delimitors are permitted around digits.
+                               // Only delimiters are permitted around digits.
                                memprintf(err, "invalid character '%c' in thread set specification: '%s'.", *sep, set);
                                return -1;
                        }