BUG/MINOR: fix various typos and spelling mistakes in user-visible messages

A few typos like "not unhandled" in error messages, and some spelling
mistakes mostly in cfgparse error messages were fixed. One spelling
mistake in a function name was fixed as well (ssl_sock_chose_sni_ctx
renamed to ssl_sock_choose_sni_ctx). Those which apply may be worth
being backported.

diff --git a/include/haproxy/ssl_sock.h b/include/haproxy/ssl_sock.h
index d6058439763ce895417febf17e61f4f0d598b93f..c2575d667ba3e9ba36914d298d6ad3cd7eebe0d0 100644 (file)
--- a/include/haproxy/ssl_sock.h
+++ b/include/haproxy/ssl_sock.h
@@ -127,7 +127,7 @@ int ssl_sock_switchctx_wolfSSL_cbk(WOLFSSL* ssl, void* arg);
 
 int increment_sslconn();
 void ssl_sock_load_cert_sni(struct ckch_inst *ckch_inst, struct bind_conf *bind_conf);
-struct sni_ctx *ssl_sock_chose_sni_ctx(struct bind_conf *s, struct connection *conn,
+struct sni_ctx *ssl_sock_choose_sni_ctx(struct bind_conf *s, struct connection *conn,
                                        const char *servername, int have_rsa_sig, int have_ecdsa_sig);
 #ifdef SSL_MODE_ASYNC
 void ssl_async_fd_handler(int fd);

diff --git a/src/cfgparse-listen.c b/src/cfgparse-listen.c
index 053be72e2fa0989c08d6866ce9797105cb3a0f16..2ef1a1081c22917037d161c50e362999968a5b01 100644 (file)
--- a/src/cfgparse-listen.c
+++ b/src/cfgparse-listen.c
@@ -1197,7 +1197,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
                if (warnifnotcap(curproxy, PR_CAP_FE, file, linenum, args[0], NULL))
                        err_code |= ERR_WARN;
                if (*(args[1]) == 0) {
-                       ha_alert("parsine [%s:%d] : '%s' expects a number. Got no argument\n",
+                       ha_alert("parsing [%s:%d] : '%s' expects a number. Got no argument\n",
                            file, linenum, args[0]);
                        err_code |= ERR_ALERT | ERR_FATAL;
                        goto out;

diff --git a/src/cfgparse-quic.c b/src/cfgparse-quic.c
index 0471791529caa6a2091adf249e1ad96a83ea6f6f..e4122bbe1fc1f68910590f0e43a47b01a35c26ae 100644 (file)
--- a/src/cfgparse-quic.c
+++ b/src/cfgparse-quic.c
@@ -370,7 +370,7 @@ static int cfg_parse_quic_time(char **args, int section_type,
                ret = 1;
        }
        else {
-               memprintf(err, "'%s' keyword not unhandled (please report this bug).", args[0]);
+               memprintf(err, "'%s' keyword not handled (please report this bug).", args[0]);
                ret = -1;
        }
 
@@ -589,7 +589,7 @@ static int cfg_parse_quic_tune_setting(char **args, int section_type,
                ret = 1;
        }
        else {
-               memprintf(err, "'%s' keyword not unhandled (please report this bug).", args[0]);
+               memprintf(err, "'%s' keyword not handled (please report this bug).", args[0]);
                return -1;
        }
 
@@ -787,7 +787,7 @@ static int quic_parse_quic_initial(char **args, int section_type, struct proxy *
        }
 
        if (!(curpx->mode & PR_MODE_HTTP)) {
-               memprintf(err, "'%s' : proxy '%s' does not used HTTP mode",
+               memprintf(err, "'%s' : proxy '%s' does not use HTTP mode",
                          args[0], curpx->id);
                return -1;
        }

diff --git a/src/cfgparse-ssl.c b/src/cfgparse-ssl.c
index f0a11ade1fb1695e01b38abf2d2755ff005f8ca9..da88ecb8154e3034ae5e35c0e2272a048b5341fb 100644 (file)
--- a/src/cfgparse-ssl.c
+++ b/src/cfgparse-ssl.c
@@ -432,7 +432,7 @@ static int ssl_parse_global_int(char **args, int section_type, struct proxy *cur
                           file, line, args[0]);
        }
        else {
-               memprintf(err, "'%s' keyword not unhandled (please report this bug).", args[0]);
+               memprintf(err, "'%s' keyword not handled (please report this bug).", args[0]);
                return -1;
        }
 

diff --git a/src/ssl_clienthello.c b/src/ssl_clienthello.c
index af4b1d9ffd507c95d78e384c70a03f6070f3d680..54d51ee919a1dda24574be5b2547446209c6773c 100644 (file)
--- a/src/ssl_clienthello.c
+++ b/src/ssl_clienthello.c
@@ -37,7 +37,7 @@ static void ssl_sock_switchctx_set(SSL *ssl, SSL_CTX *ctx)
  *
  * This function does a lookup in the bind_conf sni tree so the caller should lock its tree.
  */
-struct sni_ctx *ssl_sock_chose_sni_ctx(struct bind_conf *s, struct connection *conn,
+struct sni_ctx *ssl_sock_choose_sni_ctx(struct bind_conf *s, struct connection *conn,
                                        const char *servername, int have_rsa_sig, int have_ecdsa_sig)
 {
        struct ebmb_node *node, *n, *node_ecdsa = NULL, *node_rsa = NULL, *node_anonymous = NULL;
@@ -450,7 +450,7 @@ sni_lookup:
        trash.area[i] = 0;
 
        HA_RWLOCK_RDLOCK(SNI_LOCK, &s->sni_lock);
-       sni_ctx = ssl_sock_chose_sni_ctx(s, conn, trash.area, has_rsa_sig, has_ecdsa_sig);
+       sni_ctx = ssl_sock_choose_sni_ctx(s, conn, trash.area, has_rsa_sig, has_ecdsa_sig);
        if (sni_ctx) {
                /* switch ctx */
                struct ssl_bind_conf *conf = sni_ctx->conf;
@@ -746,7 +746,7 @@ sni_lookup:
        servername = trash.area;
 
        HA_RWLOCK_RDLOCK(SNI_LOCK, &s->sni_lock);
-       sni_ctx = ssl_sock_chose_sni_ctx(s, conn, servername, has_rsa_sig, has_ecdsa_sig);
+       sni_ctx = ssl_sock_choose_sni_ctx(s, conn, servername, has_rsa_sig, has_ecdsa_sig);
        if (sni_ctx) {
                /* switch ctx */
                struct ssl_bind_conf *conf = sni_ctx->conf;

diff --git a/src/ssl_gencert.c b/src/ssl_gencert.c
index d5d710daad628fd8d68ac99712bdf39b21a1bb08..5ee9b8bcd417abcde40f4a783ebeeeb08c5c33fc 100644 (file)
--- a/src/ssl_gencert.c
+++ b/src/ssl_gencert.c
@@ -100,7 +100,7 @@ static SSL_CTX *ssl_sock_do_create_cert(const char *servername, struct bind_conf
        int           key_type;
        struct sni_ctx *sni_ctx;
 
-       sni_ctx = ssl_sock_chose_sni_ctx(bind_conf, NULL, "", 1, 1);
+       sni_ctx = ssl_sock_choose_sni_ctx(bind_conf, NULL, "", 1, 1);
        if (!sni_ctx)
                goto mkcert_error;
 

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 54a2bb043e3e7142241c9325f2ea27bc557b59a9..bcc57e280ba784270c5b54828b0c3409f5271b14 100644 (file)
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -5456,7 +5456,7 @@ int ssl_sock_prepare_bind_conf(struct bind_conf *bind_conf)
                struct sni_ctx *sni_ctx;
 
                /* if we use the generate-certificates option, look for the first default cert available */
-               sni_ctx = ssl_sock_chose_sni_ctx(bind_conf, NULL, "", 1, 1);
+               sni_ctx = ssl_sock_choose_sni_ctx(bind_conf, NULL, "", 1, 1);
                if (!sni_ctx) {
                        ha_alert("Proxy '%s': no SSL certificate specified for bind '%s' and 'generate-certificates' option at [%s:%d] (use 'crt').\n",
                                 px->id, bind_conf->arg, bind_conf->file, bind_conf->line);

diff --git a/src/tcpcheck.c b/src/tcpcheck.c
index bb4d0b14a8b0f3e6df117e0fa0bfa5305b604918..9b25f263c1c959960e395366151ab18e85b3c2b6 100644 (file)
--- a/src/tcpcheck.c
+++ b/src/tcpcheck.c
@@ -2199,7 +2199,7 @@ enum tcpcheck_eval_ret tcpcheck_eval_expect_http(struct check *check, struct tcp
                        status = ((status != HCHK_STATUS_UNKNOWN) ? status : HCHK_STATUS_L7RSP);
                        if (lf_expr_isempty(&expect->onerror_fmt))
                                desc = ist("HTTP content check could not find a response body");
-                       TRACE_ERROR("no response boduy found while expected", CHK_EV_TCPCHK_EXP|CHK_EV_TCPCHK_ERR, check);
+                       TRACE_ERROR("no response body found while expected", CHK_EV_TCPCHK_EXP|CHK_EV_TCPCHK_ERR, check);
                        goto error;
                }
 

diff --git a/src/vars.c b/src/vars.c
index 1b72ebb2efb3ba2530d047d8ef7212ddde347232..c8a08b5d5aad198030f65eda6cfcec3ec9120d74 100644 (file)
--- a/src/vars.c
+++ b/src/vars.c
@@ -320,7 +320,7 @@ static int vars_fill_desc(const char *name, int len, struct var_desc *desc, char
                desc->scope = SCOPE_CHECK;
        }
        else {
-               memprintf(err, "invalid variable name '%.*s'. A variable name must be start by its scope. "
+               memprintf(err, "invalid variable name '%.*s'. A variable name must start with its scope. "
                               "The scope can be 'proc', '(p)sess', '(p)txn', '(p)req', '(p)res' or 'check'", len, name);
                return 0;
        }