konevsa/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CLEANUP: assorted typo fixes in the code and comments

Browse Source 
This is 17th iteration of typo fixes
This commit is contained in:
Ilya Shipitsin 2021-02-06 22:29:08 +05:00 committed by Christopher Faulet
parent 69164228b8
commit acf84595a7
9 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/prometheus-exporter/service-prometheus.c
View File

@ -241,7 +241,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) },
@ -287,7 +287,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_STATUS] = IST("Current status of the service, per state label value."),
[ST_F_CHECK_STATUS] = IST("Status of last health check, per state label value."),

4
doc/configuration.txt
View File

@ -18814,7 +18814,7 @@ shdr([<name>[,<occ>]]) : 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([<name>]) : 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.

2
include/haproxy/h2.h
View File

@ -182,7 +182,7 @@ enum h2_err {
#define H2_MSGF_RSP_1XX 0x0010 // 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_CONNECT 0x0040 // Extented CONNECT method from rfc 8441
#define H2_MSGF_EXT_CONNECT 0x0040 // Extended CONNECT method from rfc 8441
#define H2_MAX_STREAM_ID ((1U << 31) - 1)
#define H2_MAX_FRAME_LEN ((1U << 24) - 1)

2
include/haproxy/htx.h
View File

@ -308,7 +308,7 @@ static inline struct htx_blk *htx_get_next_blk(const struct htx *htx,
}
/* Returns 1 if <blk> is the block is the only one inside the HTX message <htx>,
* 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, this
* means that there is only <blk> and eventually some unused ones in <htx>.
*/
static inline int htx_is_unique_blk(const struct htx *htx,

4
src/h2.c
View File

@ -608,7 +608,7 @@ static struct htx_sl *h2_prepare_htx_stsline(uint32_t fields, struct ist *phdr,
* On 1xx responses there is no ES on the HEADERS frame but there is no
* body. So remove the flag H2_MSGF_BODY and add H2_MSGF_RSP_1XX to
* notify the decoder another HEADERS frame is expected.
* 204/304 resposne have no body by definition. So remove the flag
* 204/304 response have no body by definition. So remove the flag
* H2_MSGF_BODY and set H2_MSGF_BODYLESS_RSP.
*
* Note however that there is a special condition for Extended CONNECT.
@ -782,7 +782,7 @@ int h2_make_htx_response(struct http_hdr *list, struct htx *htx, unsigned int *m
if (!(*msgf & H2_MSGF_BODY) || ((*msgf & H2_MSGF_BODY_CL) && *body_len == 0) ||
(*msgf & H2_MSGF_BODY_TUNNEL)) {
/* Response without body or tunnel sucessfully established */
/* Response without body or tunnel successfully established */
sl_flags |= HTX_SL_F_BODYLESS;
htx->flags |= HTX_FL_EOM;
}

4
src/http_ana.c
View File

@ -97,7 +97,7 @@ int http_wait_for_request(struct stream *s, struct channel *req, int an_bit)
* There is a transition period during which there is no
* data. The stream is still in raw mode and SF_IGNORE flag is
* still set. When this happens, the new mux is responsible to
* handle all errors. Thus we may leave immediatly.
* handle all errors. Thus we may leave immediately.
*/
BUG_ON(!(s->flags & SF_IGNORE) || !c_empty(&s->req));
@ -1312,7 +1312,7 @@ static __inline int do_l7_retry(struct stream *s, struct stream_interface *si)
b_set_data(&req->buf, b_size(&req->buf));
co_set_data(req, b_data(&si->l7_buffer));
DBG_TRACE_DEVEL("perfrom a L7 retry", STRM_EV_STRM_ANA|STRM_EV_HTTP_ANA, s, s->txn);
DBG_TRACE_DEVEL("perform a L7 retry", STRM_EV_STRM_ANA|STRM_EV_HTTP_ANA, s, s->txn);
b_reset(&res->buf);
co_set_data(res, 0);
return 0;

6
src/mux_h1.c
View File

@ -81,7 +81,7 @@
#define H1S_F_NOT_FIRST 0x00000080 /* The H1 stream is not the first one */
#define H1S_F_BODYLESS_RESP 0x00000100 /* Bodyless response message */
/* 0x00000200 unsued */
/* 0x00000200 unused */
#define H1S_F_NOT_IMPL_ERROR 0x00000400 /* Set when a feature is not implemented during the message parsing */
#define H1S_F_PARSING_ERROR 0x00000800 /* Set when an error occurred during the message parsing */
#define H1S_F_PROCESSING_ERROR 0x00001000 /* Set when an error occurred during the message xfer */
@ -2771,7 +2771,7 @@ static int h1_process(struct h1c * h1c)
release:
if (h1c->flags & H1C_F_ST_ATTACHED) {
/* Don't release the H1 connetion right now, we must destroy the
/* Don't release the H1 connection right now, we must destroy the
* attached CS first. Here, the H1C must not be READY */
BUG_ON(!h1s || h1c->flags & H1C_F_ST_READY);
@ -2920,7 +2920,7 @@ struct task *h1_timeout_task(struct task *t, void *context, unsigned short state
}
if (h1c->flags & H1C_F_ST_ATTACHED) {
/* Don't release the H1 connetion right now, we must destroy the
/* Don't release the H1 connection right now, we must destroy the
* attached CS first. Here, the H1C must not be READY */
h1c->h1s->cs->flags |= (CS_FL_EOS|CS_FL_ERROR);
h1_alert(h1c->h1s);

8
src/mux_h2.c
View File

@ -2880,7 +2880,7 @@ static int h2c_handle_data(struct h2c *h2c, struct h2s *h2s)
* Thus the stream is closed with the CANCEL error. Here we take care it is not
* an empty DATA Frame with the ES flag. The error is only handled if ES was
* already sent to the client because depending on the scheduling, these data may
* have been sent before the server respnse but not handle here.
* have been sent before the server response but not handle here.
*/
TRACE_ERROR("Request DATA frame for aborted tunnel", H2_EV_RX_FRAME|H2_EV_RX_DATA, h2c->conn, h2s);
error = H2_ERR_CANCEL;
@ -4694,7 +4694,7 @@ next_frame:
msgf = (h2c->dff & H2_F_HEADERS_END_STREAM) ? 0 : H2_MSGF_BODY;
msgf |= (*flags & H2_SF_BODY_TUNNEL) ? H2_MSGF_BODY_TUNNEL: 0;
/* If an Extended CONNECT has been sent on this stream, set message flag
* to convert 200 response to 101 htx reponse */
* to convert 200 response to 101 htx response */
msgf |= (*flags & H2_SF_EXT_CONNECT_SENT) ? H2_MSGF_EXT_CONNECT: 0;
if (*flags & H2_SF_HEADERS_RCVD)
@ -5196,7 +5196,7 @@ static size_t h2s_bck_make_req_headers(struct h2s *h2s, struct htx *htx)
isteq(list[hdr].n, ist2(h2c->proxy->server_id_hdr_name, h2c->proxy->server_id_hdr_len)))
continue;
/* Convert connection: upgrade to Extented connect from rfc 8441 */
/* Convert connection: upgrade to Extended connect from rfc 8441 */
if (isteqi(list[hdr].n, ist("connection"))) {
/* rfc 7230 #6.1 Connection = list of tokens */
struct ist connection_ist = list[hdr].v;
@ -5836,7 +5836,7 @@ static size_t h2s_make_data(struct h2s *h2s, struct buffer *buf, size_t count)
/* Skip the message payload (DATA blocks) and emit an empty DATA frame with the
* ES flag set for stream <h2s>. This function is called for response known to
* have no payload. Only DATA blocks are skipped. This means the trailers are
* still emited. The caller must check the stream's status to detect any error
* still emitted. The caller must check the stream's status to detect any error
* which might have happened subsequently to a successful send. Returns the
* number of data bytes consumed, or zero if nothing done.
*/

2
src/ssl_ckch.c
View File

@ -1402,7 +1402,7 @@ static int cli_io_handler_commit_cert(struct appctx *appctx)
int i;
/* The certificate update on the server side (backend)
* can be done by rewritting a single pointer so no
* can be done by rewriting a single pointer so no
* locks are needed here. */
/* free the server current SSL_CTX */
SSL_CTX_free(ckchi->server->ssl_ctx.ctx);