]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MINOR: tcpcheck: Fix typo in error error message for `http-check expect`
authorTim Duesterhus <tim@tideways-gmbh.com>
Fri, 20 Feb 2026 11:20:05 +0000 (12:20 +0100)
committerWilliam Lallemand <wlallemand@haproxy.com>
Thu, 12 Mar 2026 08:10:45 +0000 (09:10 +0100)
With a config:

    backend bk_app
     http-check expect status 200 string "status: ok"

This now correctly emits the error:

    config : parsing [./patch.cfg:2] : 'http-check expect' : only one pattern expected.

This line containing the typo is unchanged since at least HAProxy 2.2, the
patch should be backported into all supported branches.

src/tcpcheck.c

index 3d99dfd2a92cc3ad02a2e8e06e819bb2c70fdbdb..86c798e732f6f0070ac2051c64782bd220b05ec6 100644 (file)
@@ -3262,7 +3262,7 @@ struct tcpcheck_rule *parse_tcpcheck_expect(char **args, int cur_arg, struct pro
                }
                else if (strcmp(args[cur_arg], "string") == 0 || strcmp(args[cur_arg], "rstring") == 0) {
                        if (type != TCPCHK_EXPECT_UNDEF) {
-                               memprintf(errmsg, "only on pattern expected");
+                               memprintf(errmsg, "only one pattern expected");
                                goto error;
                        }
                        if (proto != TCPCHK_RULES_HTTP_CHK)
@@ -3281,7 +3281,7 @@ struct tcpcheck_rule *parse_tcpcheck_expect(char **args, int cur_arg, struct pro
                        if (proto == TCPCHK_RULES_HTTP_CHK)
                                goto bad_http_kw;
                        if (type != TCPCHK_EXPECT_UNDEF) {
-                               memprintf(errmsg, "only on pattern expected");
+                               memprintf(errmsg, "only one pattern expected");
                                goto error;
                        }
                        type = ((*(args[cur_arg]) == 'b') ?  TCPCHK_EXPECT_BINARY : TCPCHK_EXPECT_BINARY_REGEX);
@@ -3295,7 +3295,7 @@ struct tcpcheck_rule *parse_tcpcheck_expect(char **args, int cur_arg, struct pro
                }
                else if (strcmp(args[cur_arg], "string-lf") == 0 || strcmp(args[cur_arg], "binary-lf") == 0) {
                        if (type != TCPCHK_EXPECT_UNDEF) {
-                               memprintf(errmsg, "only on pattern expected");
+                               memprintf(errmsg, "only one pattern expected");
                                goto error;
                        }
                        if (proto != TCPCHK_RULES_HTTP_CHK)
@@ -3317,7 +3317,7 @@ struct tcpcheck_rule *parse_tcpcheck_expect(char **args, int cur_arg, struct pro
                        if (proto != TCPCHK_RULES_HTTP_CHK)
                                goto bad_tcp_kw;
                        if (type != TCPCHK_EXPECT_UNDEF) {
-                               memprintf(errmsg, "only on pattern expected");
+                               memprintf(errmsg, "only one pattern expected");
                                goto error;
                        }
                        type = ((*(args[cur_arg]) == 's') ? TCPCHK_EXPECT_HTTP_STATUS : TCPCHK_EXPECT_HTTP_STATUS_REGEX);
@@ -3335,7 +3335,7 @@ struct tcpcheck_rule *parse_tcpcheck_expect(char **args, int cur_arg, struct pro
                                goto error;
                        }
                        if (type != TCPCHK_EXPECT_UNDEF) {
-                               memprintf(errmsg, "only on pattern expected");
+                               memprintf(errmsg, "only one pattern expected");
                                goto error;
                        }
                        type = TCPCHK_EXPECT_CUSTOM;
@@ -3346,7 +3346,7 @@ struct tcpcheck_rule *parse_tcpcheck_expect(char **args, int cur_arg, struct pro
                        if (proto != TCPCHK_RULES_HTTP_CHK)
                                goto bad_tcp_kw;
                        if (type != TCPCHK_EXPECT_UNDEF) {
-                               memprintf(errmsg, "only on pattern expected");
+                               memprintf(errmsg, "only one pattern expected");
                                goto error;
                        }
                        type = TCPCHK_EXPECT_HTTP_HEADER;