From 8705e45964e1a544745aca7a64aa45d3515fef90 Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin Date: Fri, 29 Dec 2023 20:05:20 +0100 Subject: [PATCH] CLEANUP: assorted typo fixes in the code and comments This is 38th iteration of typo fixes --- addons/promex/service-prometheus.c | 2 +- dev/patchbot/README | 2 +- doc/configuration.txt | 24 ++++++++++++------------ include/haproxy/connection-t.h | 2 +- include/haproxy/quic_tx.h | 2 +- include/haproxy/server-t.h | 2 +- src/h3.c | 2 +- src/mux_quic.c | 2 +- src/proto_rhttp.c | 6 +++--- src/server.c | 6 +++--- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/addons/promex/service-prometheus.c b/addons/promex/service-prometheus.c index 01408d298..228e0db69 100644 --- a/addons/promex/service-prometheus.c +++ b/addons/promex/service-prometheus.c @@ -310,7 +310,7 @@ const struct promex_metric promex_st_metrics[ST_F_TOTAL_FIELDS] = { const struct ist promex_st_front_metrics_names[ST_F_TOTAL_FIELDS] = { }; -/* Specialized bakcend metric names, to override default ones */ +/* Specialized backend metric names, to override default ones */ const struct ist promex_st_back_metrics_names[ST_F_TOTAL_FIELDS] = { }; diff --git a/dev/patchbot/README b/dev/patchbot/README index 169305608..a645cc304 100644 --- a/dev/patchbot/README +++ b/dev/patchbot/README @@ -256,7 +256,7 @@ proposed deployment layout is the following: channel systems. From this point, executing this update script manually should work and produce -the result. Count arount 0.5-2 mn per patch on a 8-core machine, so it can be +the result. Count around 0.5-2 mn per patch on a 8-core machine, so it can be reasonably fast during the early development stages (before -dev1) but unbearably long later, where it can make more sense to run it at night. It should not report any error and should only report the total execution time. diff --git a/doc/configuration.txt b/doc/configuration.txt index 97602c88e..f734f03c3 100644 --- a/doc/configuration.txt +++ b/doc/configuration.txt @@ -240,7 +240,7 @@ sometimes more) streams in parallel over a same connection, and let the server sort them out and respond in any order depending on what response is available. The main benefit of the multiplexed mode is that it significantly reduces the number of round trips, and speeds up page loading time over high latency -networks. It is sometimes visibles on sites using many images, where all images +networks. It is sometimes visible on sites using many images, where all images appear to load in parallel. These protocols have also improved their efficiency by adopting some mechanisms @@ -282,7 +282,7 @@ HAProxy essentially supports 3 connection modes : In addition to this, by default, the server-facing connection is reusable by any request from any client, as mandated by the HTTP protocol specification, so any information pertaining to a specific client has to be passed along with -each request if needed (e.g. client's source adress etc). When HTTP/2 is used +each request if needed (e.g. client's source address etc). When HTTP/2 is used with a server, by default HAProxy will dedicate this connection to the same client to avoid the risk of head of line blocking between clients. @@ -1153,17 +1153,17 @@ Both time and size formats require integers, decimal notation is not allowed. It is possible to use a list of pattern for maps or ACLs. A list of pattern is identified by its name and may be used at different places in the -configuration. List of pattern are splitted on three categories depending on +configuration. List of pattern are split on three categories depending on the name format: * Lists of pattern based on regular files: It is the default case. The filename, absolute or relative, is used as name. The file must exist otherwise an error is triggered. But it may be empty. The "file@" prefix - may also be specificed but it is not part of the name identifying the + may also be specified but it is not part of the name identifying the list. A filename, with or without the prefix, references the same list of pattern. - * Lists of pattern based on optional files: The filename must be preceeds by + * Lists of pattern based on optional files: The filename must be preceded by "opt@" prefix. The file existence is optional. If the file exists, its content is loaded but no error is reported if not. The prefix is not part of the name identifying the list. It means, for a given filename, Optional @@ -1174,8 +1174,8 @@ the name format: the name. Thus it cannot be mixed with other kind of lists. Virtual files are useful when patterns are fully dynamically managed with no -patterns on startup and on reload. Optional files may be used in the same -conditons. But patterns can be dumped in the file, via an external script based +patterns on startup and on reload. Optional files may be used under the same +conditions. But patterns can be dumped in the file, via an external script based on the "show map" CLI command for instance. This way, it is possible to keep patterns on reload. @@ -13887,7 +13887,7 @@ capture [ len | id ] This captures sample expression from the request or response buffer, and converts it to a string of at most characters. The resulting string - is stored into the next "capture" slot (either request or reponse), so it + is stored into the next "capture" slot (either request or response), so it will possibly appear next to some captured HTTP headers. It will then automatically appear in the logs, and it will be possible to extract it using sample fetch methods to feed it into headers or anything. The length should @@ -15010,7 +15010,7 @@ silent-drop [ rst-ttl ] the RST packet travels through the local infrastructure, deleting the connection in firewalls and other systems, but disappears before reaching the client. Future packets from the client will then be dropped already by - front equipments. These local RSTs protect local resources, but not the + front equipment. These local RSTs protect local resources, but not the client's. This must not be used unless the consequences of doing this are fully understood. @@ -15104,7 +15104,7 @@ track-sc2 [table ] is mandatory, and is a sample expression rule as described in section 7.3. It describes what elements of the incoming connection, - request or reponse will be analyzed, extracted, combined, and used + request or response will be analyzed, extracted, combined, and used to select which table entry to update the counters.
is an optional table to be used instead of the default one, which @@ -16072,7 +16072,7 @@ thread [/][,...] lines and their assignment to multiple groups of threads. This keyword is compatible with reverse HTTP binds. However, it is forbidden - to specify a thread set which spans accross several thread groups for such a + to specify a thread set which spans across several thread groups for such a listener as this may caused "nbconn" to not work as intended. tls-ticket-keys @@ -20818,7 +20818,7 @@ txn.conn_retries : integer affected by L7 retries. txn.sess_term_state : string - Retruns the TCP or HTTP stream termination state, as reported in the log. It + Returns the TCP or HTTP stream termination state, as reported in the log. It is a 2-characters string, The final stream state followed by the event which caused its to terminate. See section 8.5 about stream state at disconnection for the list of possible events. The current value at time the sample fetch diff --git a/include/haproxy/connection-t.h b/include/haproxy/connection-t.h index 2619fd66d..b8753c821 100644 --- a/include/haproxy/connection-t.h +++ b/include/haproxy/connection-t.h @@ -341,7 +341,7 @@ enum mux_ctl_type { /* sctl command used by mux->sctl() */ enum mux_sctl_type { - MUX_SCTL_SID, /* Return the mux stream ID as ouput, as a signed 64bits integer */ + MUX_SCTL_SID, /* Return the mux stream ID as output, as a signed 64bits integer */ }; /* response for ctl MUX_STATUS */ diff --git a/include/haproxy/quic_tx.h b/include/haproxy/quic_tx.h index 0659c14e3..8d8c5c305 100644 --- a/include/haproxy/quic_tx.h +++ b/include/haproxy/quic_tx.h @@ -79,7 +79,7 @@ static inline void quic_tx_packet_refdec(struct quic_tx_packet *pkt) } /* Return the number of bytes which may be sent from connection when - * it has not already been validated. Note that this is the responsability + * it has not already been validated. Note that this is the responsibility * of the caller to check that the case with quic_peer_validated_addr(). * This latter BUG_ON() if 3 * qc->rx.bytes < qc->tx.prep_bytes. */ diff --git a/include/haproxy/server-t.h b/include/haproxy/server-t.h index fbe733154..40002f8f8 100644 --- a/include/haproxy/server-t.h +++ b/include/haproxy/server-t.h @@ -612,7 +612,7 @@ struct server_inetaddr { } port; }; -/* struct to store informations about server's addr / port updater in +/* struct to store information about server's addr / port updater in * INET context */ enum server_inetaddr_updater_by { diff --git a/src/h3.c b/src/h3.c index f020423ff..f0ac69508 100644 --- a/src/h3.c +++ b/src/h3.c @@ -1960,7 +1960,7 @@ static size_t h3_snd_buf(struct qcs *qcs, struct buffer *buf, size_t count) break; } - /* If an error occured, either buffer space or connection error + /* If an error occurred, either buffer space or connection error * must be set to break current loop. */ BUG_ON(ret < 0 && !(qcs->flags & QC_SF_BLK_MROOM) && !h3c->err); diff --git a/src/mux_quic.c b/src/mux_quic.c index 1ad4a07de..f2d5d19a8 100644 --- a/src/mux_quic.c +++ b/src/mux_quic.c @@ -2863,7 +2863,7 @@ static size_t qmux_strm_nego_ff(struct stconn *sc, struct buffer *input, } if (!qcs->qcc->app_ops->nego_ff || !qcs->qcc->app_ops->done_ff) { - /* Fast forwading is not supported by the QUIC application layer */ + /* Fast forwarding is not supported by the QUIC application layer */ qcs->sd->iobuf.flags |= IOBUF_FL_NO_FF; goto end; } diff --git a/src/proto_rhttp.c b/src/proto_rhttp.c index 452ee32d7..2f1004cde 100644 --- a/src/proto_rhttp.c +++ b/src/proto_rhttp.c @@ -437,10 +437,10 @@ void rhttp_unbind_receiver(struct listener *l) int rhttp_set_affinity(struct connection *conn, int new_tid) { - /* Explicitely disable connection thread migration on accept. Indeed, + /* Explicitly disable connection thread migration on accept. Indeed, * it's unsafe to move a connection with its FD to another thread. Note * that active reverse task thread migration should be sufficient to - * ensure repartition of reversed connections accross listener threads. + * ensure repartition of reversed connections across listener threads. */ return -1; } @@ -452,7 +452,7 @@ int rhttp_accepting_conn(const struct receiver *rx) INITCALL1(STG_REGISTER, protocol_register, &proto_rhttp); -/* perform minimal intializations */ +/* perform minimal initializations */ static void init_rhttp() { int i; diff --git a/src/server.c b/src/server.c index 8718adc91..6a082fcb0 100644 --- a/src/server.c +++ b/src/server.c @@ -170,7 +170,7 @@ int srv_getinter(const struct check *check) /* Update server's addr:svc_port tuple in INET context * - * Must be called under thread isolation to ensure consistent readings accross + * Must be called under thread isolation to ensure consistent readings across * all threads (addr:svc_port might be read without srv lock being held). */ static void _srv_set_inetaddr_port(struct server *srv, @@ -295,7 +295,7 @@ static struct task *server_atomic_sync(struct task *task, void *context, unsigne /* * this requires thread isolation, which is safe since we're the only * task working for the current subscription and we don't hold locks - * or ressources that other threads may depend on to complete a running + * or resources that other threads may depend on to complete a running * cycle. Note that we do this way because we assume that this event is * rather rare. */ @@ -3630,7 +3630,7 @@ struct server *server_find_by_name(struct proxy *bk, const char *name) * from the proxy. For this we assume that is unique within the list, * which is the case in most setups, but in rare cases the user may have * enforced duplicate server names in the initial config (ie: if he intends to - * use numerical IDs for indentification instead). In this particular case, the + * use numerical IDs for identification instead). In this particular case, the * function will not work as expected so server_find_by_id_unique() should be * used to match a unique server instead. *