Fix typos and spelling mistakes in sources files and in the BRANCHES.
These mistakes are harmless, no backport needed.
---
BRANCHES | 2 +-
include/haproxy/htx-t.h | 6 +++---
include/haproxy/obj_type-t.h | 2 +-
src/chunk.c | 2 +-
src/h1_htx.c | 2 +-
src/haproxy.c | 10 +++++-----
src/htx.c | 2 +-
src/mux_h1.c | 2 +-
8 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/BRANCHES b/BRANCHES
index cc2c15f6e..d2af8876f 100644
--- a/BRANCHES
+++ b/BRANCHES
@@ -137,7 +137,7 @@ release. These branches were emitted at a pace of one per
year since 1.5 in
2014. As of 2019, 1.5 is still supported and widely used, even though it very
rarely receives updates. After a few years these LTS branches enter a
"critical fixes only" status, which means that they will rarely receive a fix
-but if that a critital issue affects them, a release will be made, with or
+but if that a critical issue affects them, a release will be made, with or
without any other fix. Once a version is not supported anymore, it will not
receive any fix at all and it will really be time for you to upgrade to a more
recent branch. Please note that even when an upgrade is needed, a great care is
diff --git a/include/haproxy/htx-t.h b/include/haproxy/htx-t.h
index 2b53e03d8..c703f5577 100644
--- a/include/haproxy/htx-t.h
+++ b/include/haproxy/htx-t.h
@@ -40,7 +40,7 @@
* | HTX | PAYLOADS ==> | | <== HTX_BLKs |
* +-----+---------------+------------------------------+--------------+
* ^
- * blocks[] (the beginning of the bocks array)
+ * blocks[] (the beginning of the blocks array)
*
*
* The blocks part remains linear and sorted. You may think about it as an
array
@@ -84,7 +84,7 @@
* At the end, if payload wrapping or blocks defragmentation is not enough,
some
* free space may be get back with a full defragmentation. This way, the holes
in
* the middle are not reusable but count in the available free space. The only
- * way to reuse this lost space is to fully defragmenate the HTX message.
+ * way to reuse this lost space is to fully defragment the HTX message.
*
* - * -
*
@@ -140,7 +140,7 @@
#define HTX_SL_F_HAS_AUTHORITY 0x00000400 /* The request authority is
explicitly specified */
#define HTX_SL_F_NORMALIZED_URI 0x00000800 /* The received URI is normalized
(an implicit absolute-uri form) */
#define HTX_SL_F_CONN_UPG 0x00001000 /* The message contains
"connection: upgrade" header */
-#define HTX_SL_F_BODYLESS_RESP 0x00002000 /* The response to this message is
bodyloess (only for request) */
+#define HTX_SL_F_BODYLESS_RESP 0x00002000 /* The response to this message is
bodyless (only for request) */
#define HTX_SL_F_NOT_HTTP 0x00004000 /* Not an HTTP message (e.g "RTSP",
only possible if invalid message are accepted) */
/* This function is used to report flags in debugging tools. Please reflect
diff --git a/include/haproxy/obj_type-t.h b/include/haproxy/obj_type-t.h
index f57fbf01a..d2832054f 100644
--- a/include/haproxy/obj_type-t.h
+++ b/include/haproxy/obj_type-t.h
@@ -24,7 +24,7 @@
/* The principle is to be able to change the type of a pointer by pointing
* it directly to an object type. The object type indicates the format of the
- * structure holing the type, and this is used to retrieve the pointer to the
+ * structure holding the type, and this is used to retrieve the pointer to the
* beginning of the structure. Doing so saves us from having to maintain both
* a pointer and a type for elements such as connections which can point to
* various types of objects.
diff --git a/src/chunk.c b/src/chunk.c
index b35a01d87..fd95b9687 100644
--- a/src/chunk.c
+++ b/src/chunk.c
@@ -144,7 +144,7 @@ struct buffer *get_small_trash_chunk(void)
}
/* Returns a trash chunk accordingly to the requested size. This function may
- * fail if the requested size is too big or if the large chubks are not
+ * fail if the requested size is too big or if the large chunks are not
* configured.
*/
struct buffer *get_trash_chunk_sz(size_t size)
diff --git a/src/h1_htx.c b/src/h1_htx.c
index 55ddc6fb6..9e2996e19 100644
--- a/src/h1_htx.c
+++ b/src/h1_htx.c
@@ -400,7 +400,7 @@ int h1_parse_msg_hdrs(struct h1m *h1m, union h1_sl *h1sl,
struct htx *dsthtx,
if (!max || !b_data(srcbuf))
goto end;
- /* Realing input buffer if necessary */
+ /* Realign input buffer if necessary */
if (b_head(srcbuf) + b_data(srcbuf) > b_wrap(srcbuf))
b_slow_realign_ofs(srcbuf, trash.area, 0);
diff --git a/src/haproxy.c b/src/haproxy.c
index 32702ea74..72c68bb20 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -827,7 +827,7 @@ int tell_old_pids(int sig)
}
/*
- * remove a pid forom the olpid array and decrease nb_oldpids
+ * remove a pid from the olpid array and decrease nb_oldpids
* return 1 pid was found otherwise return 0
*/
@@ -3025,7 +3025,7 @@ void run_poll_loop()
old_detected = stop_detected;
/*
- * Check if ze're the first to detect the
+ * Check if we're the first to detect the
* stop
*/
while (old_detected == 0 &&
@@ -3493,7 +3493,7 @@ int main(int argc, char **argv)
step_init_2(argc, argv);
RUN_INITCALLS(STG_INIT_2);
- /* Late init step: register signals for worker and standalon modes,
apply
+ /* Late init step: register signals for worker and standalone modes,
apply
* nofile and memory limits, apply capabilities from binary, if any.
*/
step_init_3();
@@ -3613,12 +3613,12 @@ int main(int argc, char **argv)
/* set_identity() above might have dropped LSTCHK_NETADM or/and
* LSTCHK_SYSADM if it changed to a new UID while preserving enough
- * permissions to honnor LSTCHK_NETADM/LSTCHK_SYSADM.
+ * permissions to honor LSTCHK_NETADM/LSTCHK_SYSADM.
*/
if ((global.last_checks & (LSTCHK_NETADM|LSTCHK_SYSADM)) && getuid()) {
/* If global.uid is present in config, it is already set as euid
* and ruid by set_identity() just above, so it's better to
- * remind the user to fix uncoherent settings.
+ * remind the user to fix incoherent settings.
*/
if (global.uid > 0) {
ha_alert("[%s.main()] Some configuration options
require full "
diff --git a/src/htx.c b/src/htx.c
index aedf7a483..16c09969a 100644
--- a/src/htx.c
+++ b/src/htx.c
@@ -679,7 +679,7 @@ struct htx_blk *htx_replace_blk_value(struct htx *htx,
struct htx_blk *blk,
htx->data += delta;
htx->flags |= HTX_FL_FRAGMENTED;
}
- else { /* Do a degrag first (it is always an expansion) */
+ else { /* Do a defrag first (it is always an expansion) */
struct htx_blk tmpblk;
struct buffer *chunk = alloc_trash_chunk();
void *ptr;
diff --git a/src/mux_h1.c b/src/mux_h1.c
index f8eaaccfb..982d267b7 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -853,7 +853,7 @@ static void h1_set_idle_expiration(struct h1c *h1c)
/*****************************************************************/
/* functions below are dedicated to the mux setup and management */
/*****************************************************************/
-/* Set EOI on stream connector in DONE state iff:
+/* Set EOI on stream connector in DONE state if:
* - it is a response
* - it is a request and the response is DONE too
* - it is a request but no a protocol upgrade nor a CONNECT
--
Egor Shestakov
egor ascii(0x40) ved1 ascii(0x2E) me
