From 8293658170352462431b83e33bd5054b3021c623 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Fri, 30 Nov 2007 15:20:09 +0100 Subject: [PATCH] [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. --- src/cfgparse.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/cfgparse.c b/src/cfgparse.c index f283332b4..b407b078c 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 */