CLEANUP: h1/htx: fix a few typos in warning, debug and trace messages

Just a few minor user visible issues issues found in mux_h1 and http_htx
(traces, warnings and debug output). This may be backported though isn't
important at all.

diff --git a/src/http_htx.c b/src/http_htx.c
index c870fa11b7527c350b634f9f7d00ede492c6dc4e..9e43d4e0423c7bd1c1ccb50d42d3ab66ddb5aa1f 100644 (file)
--- a/src/http_htx.c
+++ b/src/http_htx.c
@@ -1763,13 +1763,13 @@ struct http_reply *http_parse_http_reply(const char **args, int *orig_arg, struc
 
                if (reply->ctype) {
                        ha_warning("parsing [%s:%d] : content-type '%s' ignored by the http reply when used "
-                                  "with an erorrfile.\n",
+                                  "with an errorfile.\n",
                                   px->conf.args.file, px->conf.args.line, reply->ctype);
                        ha_free(&reply->ctype);
                }
                if (!LIST_ISEMPTY(&reply->hdrs)) {
                        ha_warning("parsing [%s:%d] : hdr parameters ignored by the http reply when used "
-                                  "with an erorrfile.\n",
+                                  "with an errorfile.\n",
                                   px->conf.args.file, px->conf.args.line);
                        list_for_each_entry_safe(hdr, hdrb, &reply->hdrs, list) {
                                LIST_DELETE(&hdr->list);

diff --git a/src/mux_h1.c b/src/mux_h1.c
index f115434965e1a7ef70883e2dd96def3b61582c54..b5c0fd3a5de8c50b042bf8ac5a2401e03bb826df 100644 (file)
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -1771,7 +1771,7 @@ static void h1_show_error_snapshot(struct buffer *out, const struct error_snapsh
        chunk_appendf(out,
                      "  H1 connection flags 0x%08x, H1 stream flags 0x%08x\n"
                      "  H1 msg state %s(%d), H1 msg flags 0x%08x\n"
-                     "  H1 chunk len %lld bytes, H1 body len %lld bytes :\n",
+                     "  H1 chunk len %llu bytes, H1 body len %llu bytes :\n",
                      es->ctx.h1.c_flags, es->ctx.h1.s_flags,
                      h1m_state_str(es->ctx.h1.state), es->ctx.h1.state,
                      es->ctx.h1.m_flags, es->ctx.h1.m_clen, es->ctx.h1.m_blen);
@@ -4204,8 +4204,8 @@ static int h1_process(struct h1c * h1c)
                                        se_fl_set(h1s->sd, SE_FL_ERROR); /* Set EOS here to release the SC */
                                }
                                h1c->errcode = 405;
-                               TRACE_ERROR("H2 update not allowed", H1_EV_H1C_WAKE|H1_EV_H1C_ERR);
-                               h1_report_glitch(h1c, 1, "H2 update not allowed");
+                               TRACE_ERROR("H2 upgrade not allowed", H1_EV_H1C_WAKE|H1_EV_H1C_ERR);
+                               h1_report_glitch(h1c, 1, "H2 upgrade not allowed");
                                h1_handle_parsing_error(h1c);
                                goto no_parsing;
                        }