Skip to content

Commit

Permalink
CLEANUP: assorted typo fixes in the code and comments
Browse files Browse the repository at this point in the history
This is 43rd iteration of typo fixes
  • Loading branch information
chipitsine authored and wtarreau committed Sep 3, 2024
1 parent e1cae42 commit 1f6e5f7
Show file tree
Hide file tree
Showing 15 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion admin/release-estimator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ the queue.


## Installation
It can be easilly installed with venv from python3
It can be easily installed with venv from python3


$ python3 -m venv ~/.local/venvs/stable-bot/
Expand Down
14 changes: 7 additions & 7 deletions doc/configuration.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14748,7 +14748,7 @@ dgram-drop
X | - | - | - | - | - | - | -

This silently ignores the reception of a QUIC initial packet which otherwise
whould have resulted in a new QUIC connection instantiation and its SSL
would have resulted in a new QUIC connection instantiation and its SSL
handshake execution.


Expand Down Expand Up @@ -18280,7 +18280,7 @@ sni <expression>
checks, see the "check-sni" directive for more details.

By default, the SNI is assigned to the connection name for "http-reuse",
unless overriden by the "pool-conn-name" server keyword.
unless overridden by the "pool-conn-name" server keyword.

source <addr>[:<pl>[-<ph>]] [usesrc { <addr2>[:<port2>] | client | clientip } ]
source <addr>[:<port>] [usesrc { <addr2>[:<port2>] | hdr_ip(<hdr>[,<occ>]) } ]
Expand Down Expand Up @@ -21586,7 +21586,7 @@ queue([<backend>]) : integer

quic_enabled : boolean
Return true when the support for QUIC transport protocol was compiled and
if this procotol was not disabled by "no-quic" global option. See also "no-quic"
if this protocol was not disabled by "no-quic" global option. See also "no-quic"
global option.

rand([<range>]) : integer
Expand Down Expand Up @@ -22047,7 +22047,7 @@ bc_srv_queue : integer
bc_settings_streams_limit : integer
Returns the maximum number of streams allowed on the backend connection. For
TCP and HTTP/1.1 connections, it is always 1. For other protocols, it depends
on the settings negociated with the server.
on the settings negotiated with the server.

be_id : integer
Returns an integer containing the current backend's id. It can be used in
Expand Down Expand Up @@ -22370,7 +22370,7 @@ fc_src_port : integer
fc_settings_streams_limit : integer
Returns the maximum number of streams allowed on the frontend connection. For
TCP and HTTP/1.1 connections, it is always 1. For other protocols, it depends
on the settings negociated with the client.
on the settings negotiated with the client.

fc_unacked : integer
Returns the unacked counter measured by the kernel for the client connection.
Expand Down Expand Up @@ -26290,7 +26290,7 @@ quoted ("Q") and escaped ("E") string formats.
Special alias "%OG" may be used to retrieve the log origin (when / where
the log was generated) in a human readable format. It is particularly useful
with "option logasap" because some log variables or sample fetches could report
incomplete values or behave diffently depending on when / where the logformat
incomplete values or behave differently depending on when / where the logformat
expression was evaluated. Possible values are:
- "sess_error": log was generated during session error handling
- "sess_killed": log was generated during session abortion (killed
Expand Down Expand Up @@ -27609,7 +27609,7 @@ SPOE communicates with external components using an in-house binary protocol,
the Stream Processing Offload Protocol (SPOP).

When the SPOE is used on a stream, a dedicated stream is spawned to handle the
communcation with the external component. The main stream is the parent stream
communication with the external component. The main stream is the parent stream
of this "SPOE" stream. It means it is possible to retrieve variables of the
main stream from the "SPOE" stream. See section 2.8 about variables for
details.
Expand Down
2 changes: 1 addition & 1 deletion doc/management.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2566,7 +2566,7 @@ set table <table> ptr <ptr> [data.<data_type> <value>]*
<ptr> is written in the form 0xffff and must correspond to the address
returned by a previous "show table" command. Matching an entry using its
pointer may be relevant if the entry cannot be matched using the key due to
empty key or imcompatible characters on the cli.
empty key or incompatible characters on the cli.

set timeout cli <delay>
Change the CLI interface timeout for current connection. This can be useful
Expand Down
2 changes: 1 addition & 1 deletion include/haproxy/channel.h
Original file line number Diff line number Diff line change
Expand Up @@ -694,7 +694,7 @@ static inline int channel_htx_recv_limit(const struct channel *chn, const struct
unsigned int transit;
int reserve;

/* return zeor if not allocated */
/* return zero if not allocated */
if (!htx->size)
return 0;

Expand Down
6 changes: 3 additions & 3 deletions include/haproxy/fcgi-app-t.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ struct fcgi_rule_conf {
struct list list;
};

/* parameter rule evaluated during request analyzis */
/* parameter rule evaluated during request analysis */
struct fcgi_rule {
enum fcgi_rule_type type;
struct ist name; /* name of the parameter/header */
Expand All @@ -65,14 +65,14 @@ struct fcgi_rule {
struct list list;
};

/* parameter rule to set/unset a param at the end of the analyzis */
/* parameter rule to set/unset a param at the end of the analysis */
struct fcgi_param_rule {
struct ist name;
struct lf_expr *value; /* if empty , unset the parameter */
struct ebpt_node node;
};

/* header rule to pass/hide a header at the end of the analyzis */
/* header rule to pass/hide a header at the end of the analysis */
struct fcgi_hdr_rule {
struct ist name;
int pass; /* 1 to pass the header, 0 Otherwise */
Expand Down
2 changes: 1 addition & 1 deletion include/haproxy/mux_spop-t.h
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ enum spop_conn_st {
SPOP_CS_AGENT_HELLO, /* HELLO frame sent, waiting for agent HELLO frame to define the connection settings */
SPOP_CS_FRAME_H, /* HELLO handshake finished, waiting for a frame header */
SPOP_CS_FRAME_P, /* Frame header received, waiting for a frame data */
SPOP_CS_ERROR, /* send DISCONNECT frame to be able ti close the conneciton */
SPOP_CS_ERROR, /* send DISCONNECT frame to be able ti close the connection */
SPOP_CS_CLOSING, /* DISCONNECT frame sent, waiting for the agent DISCONNECT frame before closing */
SPOP_CS_CLOSED, /* Agent DISCONNECT frame received and close the connection ASAP */
SPOP_CS_ENTRIES
Expand Down
2 changes: 1 addition & 1 deletion include/haproxy/stconn.h
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ static inline void se_need_remote_conn(struct sedesc *se)

/* The application layer tells the stream connector that it just got the input
* buffer it was waiting for. A read activity is reported. The SC_FL_HAVE_BUFF
* flag is set and held until sc_used_buff() is called to indicatee it was
* flag is set and held until sc_used_buff() is called to indicate it was
* used.
*/
static inline void sc_have_buff(struct stconn *sc)
Expand Down
2 changes: 1 addition & 1 deletion include/haproxy/stick_table.h
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ static inline int __stksess_kill_if_expired(struct stktable *t, struct stksess *
}

/*
* Decrease the refcount of a stksess and relase it if the refcount falls to 0
* Decrease the refcount of a stksess and release it if the refcount falls to 0
* _AND_ if the session expired. Note,, the refcount is always decremented.
*
* This function locks the corresponding table shard to proceed. When this
Expand Down
2 changes: 1 addition & 1 deletion include/import/ebistree.h
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ __ebis_insert(struct eb_root *root, struct ebpt_node *new)

/* We need the common higher bits between new->key and old->key.
* This number of bits is already in <bit>.
* NOTE: we can't get here whit bit < 0 since we found a dup !
* NOTE: we can't get here with bit < 0 since we found a dup !
*/
new->node.bit = bit;
root->b[side] = eb_dotag(&new->node.branches, EB_NODE);
Expand Down
2 changes: 1 addition & 1 deletion include/import/ebsttree.h
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ __ebst_insert(struct eb_root *root, struct ebmb_node *new)

/* We need the common higher bits between new->key and old->key.
* This number of bits is already in <bit>.
* NOTE: we can't get here whit bit < 0 since we found a dup !
* NOTE: we can't get here with bit < 0 since we found a dup !
*/
new->node.bit = bit;
root->b[side] = eb_dotag(&new->node.branches, EB_NODE);
Expand Down
4 changes: 2 additions & 2 deletions include/import/mt_list.h
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ struct mt_list {
#define MT_LIST_NEXT(a, t, m) (MT_LIST_ELEM((a)->next, t, m))


/* Returns a pointer of type <t> to a structure preceeding the element which
/* Returns a pointer of type <t> to a structure preceding the element which
* contains the list element at address <a>, which is known as member <m> in
* struct t*. Example:
*
Expand Down Expand Up @@ -162,7 +162,7 @@ struct mt_list {

/* The macros below directly map to their function equivalent. They are
* provided for ease of use. Please refer to the equivalent functions
* for their decription.
* for their description.
*/
#define MT_LIST_INIT(e) (mt_list_init(e))
#define MT_LIST_ISEMPTY(e) (mt_list_isempty(e))
Expand Down
4 changes: 2 additions & 2 deletions src/debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -2438,7 +2438,7 @@ static int feed_post_mortem_late()
* feed_post_mortem_late() is registered in per_thread_init_list. Each
* thread takes a mutex before looping over this list, so
* feed_post_mortem_late() will be called by each thread in exclusive
* manner, one by one in synchronious order. Thread unlocks mutex only
* manner, one by one in synchronous order. Thread unlocks mutex only
* after executing all init functions from this list.
*/
for (i = 0; i < global.nbthread; i++) {
Expand All @@ -2447,7 +2447,7 @@ static int feed_post_mortem_late()
}

/* also set runtime process settings. At this stage we are sure, that all
* config options and limits adjustements are successfully applied.
* config options and limits adjustments are successfully applied.
*/
post_mortem.process.run_uid = geteuid();
post_mortem.process.run_gid = getegid();
Expand Down
2 changes: 1 addition & 1 deletion src/flt_spoe.c
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
#define SPOE_CTX_FL_SRV_CONNECTED 0x00000002 /* Set after that on-server-session event was processed */
#define SPOE_CTX_FL_REQ_PROCESS 0x00000004 /* Set when SPOE is processing the request */
#define SPOE_CTX_FL_RSP_PROCESS 0x00000008 /* Set when SPOE is processing the response */
/* unsued 0x00000010 */
/* unused 0x00000010 */

#define SPOE_CTX_FL_PROCESS (SPOE_CTX_FL_REQ_PROCESS|SPOE_CTX_FL_RSP_PROCESS)

Expand Down
2 changes: 1 addition & 1 deletion src/quic_cid.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* global tree. Tree access must only be done under lock protection.
*
* . CID global tree splitting
* To reduce thread contention, global CID tree is in reality splitted into 256
* To reduce thread contention, global CID tree is in reality split into 256
* distinct tree instances. Each CID is assigned to a single tree instance
* based on its content. Use quic_cid_tree_idx() to retrieve the expected tree
* location for a CID.
Expand Down
2 changes: 1 addition & 1 deletion src/stats-proxy.c
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ static struct field me_generate_field(const struct stat_col *col,

/* TODO Special case needed for ST_I_PX_REQ_TOT. It is defined as a
* generic column for backend side. Extra code required to diplay it on
* frontend side as an aggregate of values splitted by HTTP version.
* frontend side as an aggregate of values split by HTTP version.
*/
if (idx == ST_I_PX_REQ_TOT && cap == STATS_PX_CAP_FE && !stat_file) {
struct proxy *px = __objt_proxy(objt);
Expand Down

0 comments on commit 1f6e5f7

Please sign in to comment.