]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MAJOR: check: fix haproxy crash during soft-stop/soft-start
authorWilly Tarreau <w@1wt.eu>
Thu, 28 Nov 2013 10:27:16 +0000 (11:27 +0100)
committerWilly Tarreau <w@1wt.eu>
Thu, 28 Nov 2013 10:52:11 +0000 (11:52 +0100)
This is the continuation of previous fix bc16cd8 "BUG/MAJOR: fix haproxy
crash when using server tracking instead of checks", the soft-stop/start
states were not addressed by this fix.

src/checks.c

index 1cbc81ea411440208912a7421227b0bcd38823fd..d430c9b903acbdf4bdd61eecf0a4403517675dde 100644 (file)
@@ -576,7 +576,7 @@ static void set_server_disabled(struct check *check) {
 
        if (s->state & SRV_CHECKED)
                for(srv = s->tracknext; srv; srv = srv->tracknext)
-                       set_server_disabled(check);
+                       set_server_disabled(&srv->check);
 }
 
 static void set_server_enabled(struct check *check) {
@@ -610,7 +610,7 @@ static void set_server_enabled(struct check *check) {
 
        if (s->state & SRV_CHECKED)
                for(srv = s->tracknext; srv; srv = srv->tracknext)
-                       set_server_enabled(check);
+                       set_server_enabled(&srv->check);
 }
 
 static void check_failed(struct check *check)