Hi,
Sorry I haven't been able to finish to send the patches, I've been sick lately.
Hopefully I'll be able to finish to send those today and be done with the spam.
The attached patch fixes typos in the code comments of the htx subsystem.
Thanks,
Joseph
From 0f9e71c08f181797658a04337685ff220d69b3e1 Mon Sep 17 00:00:00 2001
From: Joseph Herlant <aerosti...@debian.org>
Date: Sun, 25 Nov 2018 10:43:27 -0800
Subject: [PATCH] CLEANUP: fix typos in the htx subsystem
Fix typos detected in the code comments of the htx subsystem.
---
include/proto/htx.h | 4 ++--
src/proto_htx.c | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/include/proto/htx.h b/include/proto/htx.h
index 91a2086a..4bd1d532 100644
--- a/include/proto/htx.h
+++ b/include/proto/htx.h
@@ -191,7 +191,7 @@ static inline enum htx_blk_type htx_get_tail_type(const struct htx *htx)
return (blk ? htx_get_blk_type(blk) : HTX_BLK_UNUSED);
}
-/* Returns the position of block immediatly before the one pointed by <pos>. If
+/* Returns the position of block immediately before the one pointed by <pos>. If
* the message is empty or if <pos> is the position of the head, -1 returned.
*
* An signed 32-bits integer is returned to handle -1 case. Blocks position are
@@ -210,7 +210,7 @@ static inline int32_t htx_get_prev(const struct htx *htx, uint32_t pos)
return (pos - 1);
}
-/* Returns the position of block immediatly after the one pointed by <pos>. If
+/* Returns the position of block immediately after the one pointed by <pos>. If
* the message is empty or if <pos> is the position of the tail, -1 returned.
*
* An signed 32-bits integer is returned to handle -1 case. Blocks position are
diff --git a/src/proto_htx.c b/src/proto_htx.c
index 20689727..2cf4e11e 100644
--- a/src/proto_htx.c
+++ b/src/proto_htx.c
@@ -346,7 +346,7 @@ int htx_wait_for_request(struct stream *s, struct channel *req, int an_bit)
}
}
- /* nothing to fail, let's reply normaly */
+ /* nothing to fail, let's reply normally */
txn->status = 200;
htx_reply_and_close(s, txn->status, http_error_message(s));
if (!(s->flags & SF_ERR_MASK))
@@ -3019,7 +3019,7 @@ static enum rule_result htx_req_get_intercept_rule(struct proxy *px, struct list
}
break;
- /* other flags exists, but normaly, they never be matched. */
+ /* other flags exists, but normally, they never be matched. */
default:
break;
}
@@ -3370,7 +3370,7 @@ resume_execution:
}
break;
- /* other flags exists, but normaly, they never be matched. */
+ /* other flags exists, but normally, they never be matched. */
default:
break;
}
@@ -4140,7 +4140,7 @@ static void htx_manage_client_side_cookies(struct stream *s, struct channel *req
* - delete the complete cookie if we're in insert+indirect mode, so that
* the server never sees it ;
* - remove the server id from the cookie value, and tag the cookie as an
- * application cookie so that it does not get accidentely removed later,
+ * application cookie so that it does not get accidently removed later,
* if we're in cookie prefix mode
*/
if ((s->be->ck_opts & PR_CK_PFX) && (delim != val_end)) {
@@ -5326,7 +5326,7 @@ static int htx_del_hdr_value(char *start, char *end, char **from, char *next)
/* Formats the start line of the request (without CRLF) and puts it in <str> and
- * return the written lenght. The line can be truncated if it exceeds <len>.
+ * return the written length. The line can be truncated if it exceeds <len>.
*/
static size_t htx_fmt_req_line(const union h1_sl sl, char *str, size_t len)
{
@@ -5350,7 +5350,7 @@ static size_t htx_fmt_req_line(const union h1_sl sl, char *str, size_t len)
}
/* Formats the start line of the response (without CRLF) and puts it in <str> and
- * return the written lenght. The line can be truncated if it exceeds <len>.
+ * return the written length. The line can be truncated if it exceeds <len>.
*/
static size_t htx_fmt_res_line(const union h1_sl sl, char *str, size_t len)
{
--
2.19.1
