Re: [PATCH] typo fixes
On Sat, Jun 12, 2021 at 03:57:40PM +0500, ??? wrote: > Hello, > > yet more typo and spelling fixes. Merged, thank you Ilya! Willy
[PATCH] typo fixes
Hello,
yet more typo and spelling fixes.
Ilya
From 3328f8814e7d1d5c1d708c3d5c6a472e645c9d71 Mon Sep 17 00:00:00 2001
From: Ilya Shipitsin
Date: Sat, 12 Jun 2021 15:55:27 +0500
Subject: [PATCH] CLEANUP: assorted typo fixes in the code and comments
This is 24th iteration of typo fixes
---
src/backend.c | 2 +-
src/cfgparse.c | 4 ++--
src/h1_htx.c | 8
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/backend.c b/src/backend.c
index 65beb84b7..da879eda3 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -2253,7 +2253,7 @@ void back_handle_st_cer(struct stream *s)
* redispatch). Thus we must release the SI endpoint on the server side
* an close the attached connection. It is especially important to do it
* now if the retry is not immediately performed, to be sure to release
-* ressources as soon as possible and to not catch errors from the lower
+* resources as soon as possible and to not catch errors from the lower
* layers in an unexpected state (i.e < ST_CONN).
*
* Note: the stream-interface will be switched to ST_REQ, ST_ASS or
diff --git a/src/cfgparse.c b/src/cfgparse.c
index 906ab076f..eda126bff 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -2155,7 +2155,7 @@ int readcfgfile(const char *file)
}
else if (strcmp(args[0], ".else") == 0) {
if (*args[1]) {
- ha_alert("parsing [%s:%d]: Unxpected
argument '%s' for '%s'.\n",
+ ha_alert("parsing [%s:%d]: Unexpected
argument '%s' for '%s'.\n",
file, linenum, args[1],
args[0]);
err_code |= ERR_ALERT | ERR_FATAL |
ERR_ABORT;
break;
@@ -2187,7 +2187,7 @@ int readcfgfile(const char *file)
}
else if (strcmp(args[0], ".endif") == 0) {
if (*args[1]) {
- ha_alert("parsing [%s:%d]: Unxpected
argument '%s' for '%s'.\n",
+ ha_alert("parsing [%s:%d]: Unexpected
argument '%s' for '%s'.\n",
file, linenum, args[1],
args[0]);
err_code |= ERR_ALERT | ERR_FATAL |
ERR_ABORT;
break;
diff --git a/src/h1_htx.c b/src/h1_htx.c
index 878c45db8..6ff69d0aa 100644
--- a/src/h1_htx.c
+++ b/src/h1_htx.c
@@ -463,7 +463,7 @@ static const char hextable[] = {
};
/* Generic function to parse the current HTTP chunk. It may be used to parsed
- * any kind of chunks, including incomplete HTTP chunks or splitted chunks
+ * any kind of chunks, including incomplete HTTP chunks or split chunks
* because the buffer wraps. This version tries to performed zero-copy on large
* chunks if possible.
*/
@@ -547,7 +547,7 @@ static size_t h1_parse_chunk(struct h1m *h1m, struct htx
**dsthtx,
/* Parses full contiguous HTTP chunks. This version is optimized for small
* chunks and does not performed zero-copy. It must be called in
- * H1_MSG_CHUNK_SIZE state. Be carefull if you change something in this
+ * H1_MSG_CHUNK_SIZE state. Be careful if you change something in this
* function. It is really sensitive, any change may have an impact on
* performance.
*/
@@ -689,7 +689,7 @@ static size_t h1_parse_full_contig_chunks(struct h1m *h1m,
struct htx **dsthtx,
}
/* Now check if the whole chunk is here (including the CRLF at
-* the end), otherise we switch in H1_MSG_DATA stae.
+* the end), otherwise we switch in H1_MSG_DATA state.
*/
if (chksz + 2 > -ridx) {
h1m->curr_len = chksz;
@@ -769,7 +769,7 @@ static size_t h1_parse_msg_chunks(struct h1m *h1m, struct
htx **dsthtx,
}
/* If some data remains, try to parse it using the generic
-* function handling incomplete chunks and splitted chunks
+* function handling incomplete chunks and split chunks
* because of a wrapping buffer.
*/
if (h1m->state < H1_MSG_TRAILERS && ofs < b_data(srcbuf)) {
--
2.29.2.windows.2
Re: [PATCH] typo fixes
Le 24/04/2021 à 10:28, Илья Шипицин a écrit : hello, one more typo fixing. Ilya Thanks, now merged ! -- Christopher Faulet
[PATCH] typo fixes
hello,
one more typo fixing.
Ilya
From 95a5f29e573ef02bc31c74d426f2db8fbdc1f57d Mon Sep 17 00:00:00 2001
From: Ilya Shipitsin
Date: Sat, 24 Apr 2021 13:25:42 +0500
Subject: [PATCH] CLEANUP: assorted typo fixes in the code and comments
This is 22nd iteration of typo fixes
---
doc/configuration.txt| 6 +++---
doc/management.txt | 2 +-
include/haproxy/action.h | 2 +-
include/haproxy/cpuset.h | 2 +-
include/import/slz.h | 2 +-
src/action.c | 2 +-
src/cfgdiag.c| 2 +-
src/check.c | 2 +-
src/fd.c | 2 +-
src/http_act.c | 4 ++--
src/http_ana.c | 6 +++---
src/sink.c | 4 ++--
src/slz.c| 8
src/tcpcheck.c | 4 ++--
14 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/doc/configuration.txt b/doc/configuration.txt
index 375eedafa..db78c0704 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -6794,7 +6794,7 @@ http-request wait-for-body time [ at-least ]
follows the HAProxy time format and is expressed in milliseconds.
is optional. It is the minimum payload size to receive to stop to
- wait. It fallows the HAProxy size format and is expressed in
+ wait. It follows the HAProxy size format and is expressed in
bytes.
Example:
@@ -7248,7 +7248,7 @@ http-response wait-for-body time [ at-least ]
follows the HAProxy time format and is expressed in milliseconds.
is optional. It is the minimum payload size to receive to stop to
- wait. It fallows the HAProxy size format and is expressed in
+ wait. It follows the HAProxy size format and is expressed in
bytes.
Example:
@@ -12100,7 +12100,7 @@ tcp-request content [{if | unless} ]
"tcp-request content" rules are not evaluated. This upgrade method should be
preferred to the implicit one consisting to rely on the backend mode. When
used, it is possible to set HTTP directives in a frontend without any
- warning. These directives will be conditionnaly evaluated if the HTTP upgrade
+ warning. These directives will be conditionaly evaluated if the HTTP upgrade
is performed. However, an HTTP backend must still be selected. It remains
unsupported to route an HTTP connection (upgraded or not) to a TCP server.
diff --git a/doc/management.txt b/doc/management.txt
index cee26839a..1e79eb788 100644
--- a/doc/management.txt
+++ b/doc/management.txt
@@ -1793,7 +1793,7 @@ set var
may only involve "internal" sample fetch keywords and converters
even though the most likely useful ones will be str('something') or int().
Note that the command line parser doesn't know about quotes, so any space in
- the expression must be preceeded by a backslash. This command requires levels
+ the expression must be preceded by a backslash. This command requires levels
"operator" or "admin". This command is only supported on a CLI connection
running in experimental mode (see "experimental-mode on").
diff --git a/include/haproxy/action.h b/include/haproxy/action.h
index 62fba7ed3..39f756f16 100644
--- a/include/haproxy/action.h
+++ b/include/haproxy/action.h
@@ -77,7 +77,7 @@ static inline void action_build_list(struct list *keywords,
}
/* Check an action ruleset validity. It returns the number of error encountered
- * andd err_code is updated if a warning is emitted.
+ * and err_code is updated if a warning is emitted.
*/
int check_action_rules(struct list *rules, struct proxy *px, int *err_code);
diff --git a/include/haproxy/cpuset.h b/include/haproxy/cpuset.h
index f6cea4325..6e1627131 100644
--- a/include/haproxy/cpuset.h
+++ b/include/haproxy/cpuset.h
@@ -27,7 +27,7 @@ int ha_cpuset_count(const struct hap_cpuset *set);
/* Returns the first index set plus one in starting from the lowest.
* Returns 0 if no index set.
- * Do not forget to substract the result by one if using it for set/clr.
+ * Do not forget to subtract the result by one if using it for set/clr.
*/
int ha_cpuset_ffs(const struct hap_cpuset *set);
diff --git a/include/import/slz.h b/include/import/slz.h
index 0251a855f..0f284e303 100644
--- a/include/import/slz.h
+++ b/include/import/slz.h
@@ -151,7 +151,7 @@ static inline long slz_encode(struct slz_stream *strm, void *out,
* It returns the number of bytes emitted. The trailer consists in flushing the
* possibly pending bits from the queue (up to 24 bits), rounding to the next
* byte, then 4 bytes for the CRC when doing zlib/gzip, then another 4 bytes
- * for the input length for gzip. That may abount to 4+4+4 = 12 bytes, that the
+ * for the input length for gzip. That may about to 4+4+4 = 12 bytes, that the
* caller must ensure are available before calling the function.
*/
static inline int slz_finish(struct slz_stream *strm, void *buf)
diff --git a/src/action.c b/src/action.c
index 5e430f23a..98359badd
Re: [PATCH] typo fixes
Le 06/02/2021 à 18:30, Илья Шипицин a écrit : Hello, another cleanup. Now merged. Thanks ! -- Christopher Faulet
[PATCH] typo fixes
Hello,
another cleanup.
Ilya
From c9fd28093d04050a9fddef84a7fd99686831aaf4 Mon Sep 17 00:00:00 2001
From: Ilya Shipitsin
Date: Sat, 6 Feb 2021 22:29:08 +0500
Subject: [PATCH] CLEANUP: assorted typo fixes in the code and comments
This is 17th iteration of typo fixes
---
contrib/prometheus-exporter/service-prometheus.c | 4 ++--
doc/configuration.txt| 4 ++--
include/haproxy/h2.h | 2 +-
include/haproxy/htx.h| 2 +-
src/h2.c | 4 ++--
src/http_ana.c | 4 ++--
src/mux_h1.c | 6 +++---
src/mux_h2.c | 8
src/ssl_ckch.c | 2 +-
9 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/contrib/prometheus-exporter/service-prometheus.c b/contrib/prometheus-exporter/service-prometheus.c
index 126962f5e..9ef0381f3 100644
--- a/contrib/prometheus-exporter/service-prometheus.c
+++ b/contrib/prometheus-exporter/service-prometheus.c
@@ -236,7 +236,7 @@ const struct promex_metric promex_st_metrics[ST_F_TOTAL_FIELDS] = {
[ST_F_COMP_BYP] = { .n = IST("http_comp_bytes_bypassed_total"), .type = PROMEX_MT_COUNTER, .flags = (PROMEX_FL_FRONT_METRIC | PROMEX_FL_BACK_METRIC ) },
[ST_F_COMP_RSP] = { .n = IST("http_comp_responses_total"),.type = PROMEX_MT_COUNTER, .flags = (PROMEX_FL_FRONT_METRIC | PROMEX_FL_BACK_METRIC ) },
[ST_F_LASTSESS] = { .n = IST("last_session_seconds"), .type = PROMEX_MT_GAUGE,.flags = ( PROMEX_FL_BACK_METRIC | PROMEX_FL_SRV_METRIC) },
- //[ST_F_LAST_CHK] ignroed
+ //[ST_F_LAST_CHK] ignored
//[ST_F_LAST_AGT] ignored
[ST_F_QTIME] = { .n = IST("queue_time_average_seconds"), .type = PROMEX_MT_GAUGE,.flags = ( PROMEX_FL_BACK_METRIC | PROMEX_FL_SRV_METRIC) },
[ST_F_CTIME] = { .n = IST("connect_time_average_seconds"), .type = PROMEX_MT_GAUGE,.flags = ( PROMEX_FL_BACK_METRIC | PROMEX_FL_SRV_METRIC) },
@@ -282,7 +282,7 @@ const struct promex_metric promex_st_metrics[ST_F_TOTAL_FIELDS] = {
[ST_F_UWEIGHT]= { .n = IST("uweight"), .type = PROMEX_MT_GAUGE,.flags = ( PROMEX_FL_BACK_METRIC | PROMEX_FL_SRV_METRIC) },
};
-/* Description of overriden stats fields */
+/* Description of overridden stats fields */
const struct ist promex_st_metric_desc[ST_F_TOTAL_FIELDS] = {
[ST_F_PXNAME] = IST("The proxy name."),
[ST_F_SVNAME] = IST("The service name (FRONTEND for frontend, BACKEND for backend, any name for server/listener)."),
diff --git a/doc/configuration.txt b/doc/configuration.txt
index f8b1e9336..c2814590e 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -18814,7 +18814,7 @@ shdr([[,]]) : string (deprecated)
This fetch works like the req.hdr() fetch with the difference that it acts
on the headers within an HTTP response.
- Like req.hdr() the res.hdr() fetch considers the comma to be a delimeter. If
+ Like req.hdr() the res.hdr() fetch considers the comma to be a delimiter. If
this is not desired res.fhdr() should be used.
It may be used in tcp-check based expect rules.
@@ -18835,7 +18835,7 @@ shdr_cnt([]) : integer (deprecated)
acts on the headers within an HTTP response.
Like req.hdr_cnt() the res.hdr_cnt() fetch considers the comma to be a
- delimeter. If this is not desired res.fhdr_cnt() should be used.
+ delimiter. If this is not desired res.fhdr_cnt() should be used.
It may be used in tcp-check based expect rules.
diff --git a/include/haproxy/h2.h b/include/haproxy/h2.h
index 1b49b850e..8d2aa9511 100644
--- a/include/haproxy/h2.h
+++ b/include/haproxy/h2.h
@@ -182,7 +182,7 @@ enum h2_err {
#define H2_MSGF_RSP_1XX0x0010// a 1xx ( != 101) HEADERS frame was received
#define H2_MSGF_BODYLESS_RSP 0x0020// response message is known to have no body
// (response to HEAD request or 204/304 response)
-#define H2_MSGF_EXT_CONNECT0x0040// Extented CONNECT method from rfc 8441
+#define H2_MSGF_EXT_CONNECT0x0040// Extended CONNECT method from rfc 8441
#define H2_MAX_STREAM_ID ((1U << 31) - 1)
#define H2_MAX_FRAME_LEN ((1U << 24) - 1)
diff --git a/include/haproxy/htx.h b/include/haproxy/htx.h
index 3ff581bac..a6c62f906 100644
--- a/include/haproxy/htx.h
+++ b/include/haproxy/htx.h
@@ -308,7 +308,7 @@ static inline struct htx_blk *htx_get_next_blk(const struct htx *htx,
}
/* Returns 1 if is the block is the only one inside the HTX message ,
- * excluding all unsued blocks. Otherwise, it returns 0. If 1 is returned, this
+ * excluding all unused blocks. Otherwise, it returns 0. If 1 is returned,
Re: [PATCH] typo fixes
On Thu, Jul 23, 2020 at 12:34:45AM +0500, ??? wrote: > Hello, > > another patch attached. Sorry for missing this one, applied now! thanks, Willy
Re: [PATCH] typo fixes
ping чт, 23 июл. 2020 г. в 00:34, Илья Шипицин : > Hello, > > another patch attached. > > Ilya Shipitcin >
[PATCH] typo fixes
Hello,
another patch attached.
Ilya Shipitcin
From 32ae9da5a78af3768bc325e04eed1352b1b13119 Mon Sep 17 00:00:00 2001
From: Ilya Shipitsin
Date: Thu, 23 Jul 2020 00:32:55 +0500
Subject: [PATCH] CLEANUP: assorted typo fixes in the code and comments
This is 12th iteration of typo fixes
---
include/haproxy/connection-t.h | 4 ++--
include/haproxy/server.h | 2 +-
src/backend.c | 2 +-
src/connection.c | 2 +-
src/flt_trace.c| 4 ++--
src/http_ana.c | 2 +-
src/log.c | 14 +++---
src/proto_udp.c| 2 +-
src/sample.c | 2 +-
9 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/include/haproxy/connection-t.h b/include/haproxy/connection-t.h
index efeb714fe..70119c16a 100644
--- a/include/haproxy/connection-t.h
+++ b/include/haproxy/connection-t.h
@@ -67,8 +67,8 @@ enum {
CS_FL_ERROR = 0x0100, /* a fatal error was reported */
- CS_FL_RCV_MORE = 0x0200, /* We may have more bytes to transfert */
- CS_FL_WANT_ROOM = 0x0400, /* More bytes to transfert, but not enough room */
+ CS_FL_RCV_MORE = 0x0200, /* We may have more bytes to transfer */
+ CS_FL_WANT_ROOM = 0x0400, /* More bytes to transfer, but not enough room */
CS_FL_ERR_PENDING = 0x0800, /* An error is pending, but there's still data to be read */
CS_FL_EOS = 0x1000, /* End of stream delivered to data layer */
/* unused: 0x2000 */
diff --git a/include/haproxy/server.h b/include/haproxy/server.h
index 269216d30..f15b7057d 100644
--- a/include/haproxy/server.h
+++ b/include/haproxy/server.h
@@ -273,7 +273,7 @@ static inline void srv_del_conn_from_list(struct server *srv, struct connection
_HA_ATOMIC_SUB(>curr_idle_thr[tid], 1);
}
else {
- /* The connction is not private and not in any server's idle
+ /* The connection is not private and not in any server's idle
* list, so decrement the current number of used connections
*/
_HA_ATOMIC_SUB(>curr_used_conns, 1);
diff --git a/src/backend.c b/src/backend.c
index b305ec0c8..df3146945 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -1502,7 +1502,7 @@ int connect_server(struct stream *s)
!(srv_conn->flags & CO_FL_PRIVATE) && srv_conn->mux->avail_streams(srv_conn) > 0)
LIST_ADDQ(>available_conns[tid], mt_list_to_list(_conn->list));
else if (srv_conn->flags & CO_FL_PRIVATE) {
- /* If it fail now, the same will be done in mux->detach() callack */
+ /* If it fail now, the same will be done in mux->detach() callback */
session_add_conn(srv_conn->owner, srv_conn, srv_conn->target);
}
}
diff --git a/src/connection.c b/src/connection.c
index 57160e711..9c017bcf9 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -71,7 +71,7 @@ int conn_create_mux(struct connection *conn)
!(conn->flags & CO_FL_PRIVATE) && conn->mux->avail_streams(conn) > 0)
LIST_ADDQ(>available_conns[tid], mt_list_to_list(>list));
else if (conn->flags & CO_FL_PRIVATE) {
- /* If it fail now, the same will be done in mux->detach() callack */
+ /* If it fail now, the same will be done in mux->detach() callback */
session_add_conn(conn->owner, conn, conn->target);
}
return 0;
diff --git a/src/flt_trace.c b/src/flt_trace.c
index f9fd24820..386de41d2 100644
--- a/src/flt_trace.c
+++ b/src/flt_trace.c
@@ -195,7 +195,7 @@ trace_init(struct proxy *px, struct flt_conf *fconf)
return 0;
}
-/* Free ressources allocated by the trace filter. */
+/* Free resources allocated by the trace filter. */
static void
trace_deinit(struct proxy *px, struct flt_conf *fconf)
{
@@ -227,7 +227,7 @@ trace_init_per_thread(struct proxy *px, struct flt_conf *fconf)
return 0;
}
-/* Free ressources allocate by the trace filter for each thread. */
+/* Free resources allocate by the trace filter for each thread. */
static void
trace_deinit_per_thread(struct proxy *px, struct flt_conf *fconf)
{
diff --git a/src/http_ana.c b/src/http_ana.c
index ae7d822a1..ac2990e99 100644
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -1842,7 +1842,7 @@ int http_wait_for_response(struct stream *s, struct channel *rep, int an_bit)
sess->flags |= SESS_FL_PREFER_LAST;
conn_set_owner(srv_conn, sess, NULL);
conn_set_private(srv_conn);
-/* If it fail now, the same will be done in mux->detach() callack */
+/* If it fail now, the same will be done in mux->detach() callback */
session_add_conn(srv_conn->owner, srv_conn, srv_conn->target);
break;
}
diff --git a/src/log.c b/src/log.c
index 495a672d2..5f1f96e51 100644
--- a/src/log.c
+++ b/src/log.c
@@ -1435,7 +1435,7 @@ void send_log(struct proxy *p, int level, const char *format, ...)
* settings.
* This function returns a struct ist array of elements of the header
* nbelem is set to the number of available elements.
- * Thos function returns currently a maximum of NB_LOG_HDR_IST_ELEMENTS
+ * This
