d5c18252d4
- [PATCH 1/2] BUG/MEDIUM: stats: properly initialize the scope before - [PATCH 2/2] BUG/MEDIUM: http: don't forward client shutdown without - [PATCH 3/8] BUG/MINOR: check: fix tcpcheck error message - [PATCH 4/8] CLEANUP: checks: fix double usage of cur / current_step - [PATCH 5/8] BUG/MEDIUM: checks: do not dereference head of a - [PATCH 6/8] CLEANUP: checks: simplify the loop processing of - [PATCH 7/8] BUG/MAJOR: checks: always check for end of list before - [PATCH 8/8] BUG/MEDIUM: checks: do not dereference a list as a - [PATCH 09/10] BUG/MEDIUM: peers: apply a random reconnection timeout - [PATCH 10/10] DOC: Update doc about weight, act and bck fields in the - [PATCH 11/14] MINOR: ssl: add a destructor to free allocated SSL - [PATCH 12/14] BUG/MEDIUM: ssl: fix tune.ssl.default-dh-param value - [PATCH 13/14] BUG/MINOR: cfgparse: fix typo in 'option httplog' error - [PATCH 14/14] BUG/MEDIUM: cfgparse: segfault when userlist is misused Signed-off-by: heil <heil@terminal-consulting.de>
28 lines
1 KiB
Diff
28 lines
1 KiB
Diff
From 68e4fc2b9910dd090c5e729203b72444f75aaa75 Mon Sep 17 00:00:00 2001
|
|
From: Baptiste Assmann <bedis9@gmail.com>
|
|
Date: Fri, 1 May 2015 08:09:29 +0200
|
|
Subject: [PATCH 3/8] BUG/MINOR: check: fix tcpcheck error message
|
|
|
|
add the keyword 'string' when required (error in a tcpcheck expect
|
|
string)
|
|
(cherry picked from commit 96a5c9b57738c05ecce7822093b9c4118123dc1e)
|
|
---
|
|
src/checks.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/checks.c b/src/checks.c
|
|
index 71debb6..8b53f97 100644
|
|
--- a/src/checks.c
|
|
+++ b/src/checks.c
|
|
@@ -614,7 +614,7 @@ static void chk_report_conn_err(struct connection *conn, int errno_bck, int expi
|
|
}
|
|
else if (check->last_started_step && check->last_started_step->action == TCPCHK_ACT_EXPECT) {
|
|
if (check->last_started_step->string)
|
|
- chunk_appendf(chk, " (string '%s')", check->last_started_step->string);
|
|
+ chunk_appendf(chk, " (expect string '%s')", check->last_started_step->string);
|
|
else if (check->last_started_step->expect_regex)
|
|
chunk_appendf(chk, " (expect regex)");
|
|
}
|
|
--
|
|
2.0.5
|
|
|