]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MEDIUM: Consistently use 'check' in process_chk
authorSimon Horman <horms@verge.net.au>
Fri, 20 Jun 2014 03:29:47 +0000 (12:29 +0900)
committerWilly Tarreau <w@1wt.eu>
Fri, 20 Jun 2014 05:04:03 +0000 (07:04 +0200)
I am not entirely sure that this is a bug, but it seems
to me that it may cause a problem if there agent-check is
configured and there is some kind of error making a connection for it.

Signed-off-by: Simon Horman <horms@verge.net.au>
src/checks.c

index cba00187304478577badbbb4dc95499003d53f1e..f3b2b545dd560d057d39ebdb269d5ac29e645822 100644 (file)
@@ -1541,7 +1541,7 @@ static struct task *process_chk(struct task *t)
                 * First, let's check whether there was an uncaught error,
                 * which can happen on connect timeout or error.
                 */
-               if (s->check.result == CHK_RES_UNKNOWN) {
+               if (check->result == CHK_RES_UNKNOWN) {
                        /* good connection is enough for pure TCP check */
                        if ((conn->flags & CO_FL_CONNECTED) && !check->type) {
                                if (check->use_ssl)