From: Willy Tarreau <w@1wt.eu>
Date: Fri, 30 Nov 2007 14:20:09 +0000 (+0100)
Subject: [MINOR] http-check disable-on-404 is not limited to HTTP mode
X-Git-Tag: v1.3.14~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8293658170352462431b83e33bd5054b3021c623;p=thirdparty%2Fhaproxy.git

[MINOR] http-check disable-on-404 is not limited to HTTP mode

This option is for health-checks, do not limit it to HTTP proxies.
---

diff --git a/src/cfgparse.c b/src/cfgparse.c
index f283332b4e..b407b078cb 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -2538,11 +2538,6 @@ int readcfgfile(const char *file)
 				Warning("parsing %s : Layer 7 hash not possible for %s '%s'. Falling back to round robin.\n",
 					file, proxy_type_str(curproxy), curproxy->id);
 			}
-			if (curproxy->options & PR_O_DISABLE404) {
-				curproxy->options &= ~PR_O_DISABLE404;
-				Warning("parsing %s : '%s' will be ignored for %s '%s' (requires HTTP mode).\n",
-					file, "disable-on-404", proxy_type_str(curproxy), curproxy->id);
-			}
 		}
 
 		if (curproxy->mode == PR_MODE_HEALTH) { /* TCP PROXY or HEALTH CHECK */
@@ -2558,11 +2553,12 @@ int readcfgfile(const char *file)
 				      file, curproxy->id);
 				cfgerr++;
 			}
-			if ((curproxy->options & PR_O_DISABLE404) && !(curproxy->options & PR_O_HTTP_CHK)) {
-				curproxy->options &= ~PR_O_DISABLE404;
-				Warning("parsing %s : '%s' will be ignored for %s '%s' (requires 'option httpchk').\n",
-					file, "disable-on-404", proxy_type_str(curproxy), curproxy->id);
-			}
+		}
+
+		if ((curproxy->options & PR_O_DISABLE404) && !(curproxy->options & PR_O_HTTP_CHK)) {
+			curproxy->options &= ~PR_O_DISABLE404;
+			Warning("parsing %s : '%s' will be ignored for %s '%s' (requires 'option httpchk').\n",
+				file, "disable-on-404", proxy_type_str(curproxy), curproxy->id);
 		}
 
 		/* if a default backend was specified, let's find it */