]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MEDIUM: check: tcpcheck regression introduced by e16c1b3f
authorBaptiste Assmann <bedis9@gmail.com>
Sat, 25 Apr 2015 14:03:06 +0000 (16:03 +0200)
committerWilly Tarreau <w@1wt.eu>
Wed, 29 Apr 2015 11:39:22 +0000 (13:39 +0200)
The commit e16c1b3f changed the way the function tcpcheck_get_step_id is
now called (check instead of server).
This change introduced a regression since now this function would return
0 all the time because of:
 if (check->current_step)
   return 0;

This patch fixes this issue by inversing the test: you want to return 0
only if current_step is not yet set :)

No backport is needed.

src/checks.c

index 3702d9a4b0fe9fb54e21c79eea0fbb897bed6e40..8a0231deb0a85e8058c2dec98b550283ff8199e7 100644 (file)
@@ -2363,7 +2363,7 @@ static int tcpcheck_get_step_id(struct check *check)
        int i = 0;
 
        /* not even started anything yet => step 0 = initial connect */
-       if (check->current_step)
+       if (!check->current_step)
                return 0;
 
        cur = check->last_started_step;