From: willy tarreau <willy@wtap.(none)>
Date: Thu, 30 Mar 2006 12:06:51 +0000 (+0200)
Subject: * it might have been possible that a flapping server would not have been
X-Git-Tag: v1.2.11.1~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06a1205f57af958aa02c4f2cf766da63ab59c904;p=thirdparty%2Fhaproxy.git

* it might have been possible that a flapping server would not have been
  detected UP is responding just before being declared down.
---

diff --git a/haproxy.c b/haproxy.c
index aba1461713..9034392655 100644
--- a/haproxy.c
+++ b/haproxy.c
@@ -5341,6 +5341,8 @@ int process_chk(struct task *t) {
 	    //fprintf(stderr, "process_chk: 9\n");
 	    s->health++; /* was bad, stays for a while */
 	    if (s->health >= s->rise) {
+		s->state |= SRV_RUNNING;
+
 		if (s->health == s->rise) {
                     recount_servers(s->proxy);
 		    Warning("%sServer %s/%s UP. %d active and %d backup servers online.%s\n",
@@ -5355,7 +5357,6 @@ int process_chk(struct task *t) {
 		}
 
 		s->health = s->rise + s->fall - 1; /* OK now */
-		s->state |= SRV_RUNNING;
 	    }
 	    s->curfd = -1; /* no check running anymore */
 	    //FD_CLR(fd, StaticWriteEvent);