mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 06:11:32 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
This option is for health-checks, do not limit it to HTTP proxies.
This commit is contained in:
Willy Tarreau 2007-11-30 15:20:09 +01:00
parent dbc36f6e44
commit 8293658170
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cfgparse.c
View File

@ -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", Warning("parsing %s : Layer 7 hash not possible for %s '%s'. Falling back to round robin.\n",
file, proxy_type_str(curproxy), curproxy->id); 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 */ if (curproxy->mode == PR_MODE_HEALTH) { /* TCP PROXY or HEALTH CHECK */
@ -2558,12 +2553,13 @@ int readcfgfile(const char *file)
file, curproxy->id); file, curproxy->id);
cfgerr++; cfgerr++;
} }
}
if ((curproxy->options & PR_O_DISABLE404) && !(curproxy->options & PR_O_HTTP_CHK)) { if ((curproxy->options & PR_O_DISABLE404) && !(curproxy->options & PR_O_HTTP_CHK)) {
curproxy->options &= ~PR_O_DISABLE404; curproxy->options &= ~PR_O_DISABLE404;
Warning("parsing %s : '%s' will be ignored for %s '%s' (requires 'option httpchk').\n", Warning("parsing %s : '%s' will be ignored for %s '%s' (requires 'option httpchk').\n",
file, "disable-on-404", proxy_type_str(curproxy), curproxy->id); file, "disable-on-404", proxy_type_str(curproxy), curproxy->id);
} }
}
/* if a default backend was specified, let's find it */ /* if a default backend was specified, let's find it */
if (curproxy->defbe.name) { if (curproxy->defbe.name) {