RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-18 19:50:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

MEDIUM: streams: Add a new keyword for retry-on, "junk-response"

Browse Source 
Add a way to retry requests if we got a junk response from the server, ie
an incomplete response, or something that is not valid HTTP.
To do so, one can use the new "junk-response" keyword for retry-on.
This commit is contained in:
Olivier Houchard 2019-05-03 23:01:47 +02:00 committed by Willy Tarreau
parent 865d8392bb
commit e3249a98e2
4 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/configuration.txt
View File

@ -8027,6 +8027,14 @@ retry-on [list of keywords]
condition, or a server crash or restart while
processing the request.
junk-response retry when the server returned something not looking
like a complete HTTP response. This includes partial
responses headers as well as non-HTTP contents. It
usually is a bad idea to retry on such events, which
may be caused a configuration issue (wrong server port)
or by the request being harmful to the server (buffer
overflow attack for example).
response-timeout the server timeout stroke while waiting for the server
to respond to the request. This may be caused by poor
network condition, the reuse of an idle connection

1
include/types/proxy.h
View File

@ -222,6 +222,7 @@ enum PR_SRV_STATE_FILE {
* reserved for eventual future status codes
*/
#define PR_RE_EARLY_ERROR 0x00010000 /* Retry if we failed at sending early data */
#define PR_RE_JUNK_REQUEST 0x00020000 /* We received an incomplete or garbage response */
struct stream;
struct http_snapshot {

3
src/proto_htx.c
View File

@ -1812,6 +1812,9 @@ int htx_wait_for_response(struct stream *s, struct channel *rep, int an_bit)
_HA_ATOMIC_ADD(&__objt_server(s->target)->counters.failed_resp, 1);
health_adjust(__objt_server(s->target), HANA_STATUS_HTTP_HDRRSP);
}
if ((s->be->retry_type & PR_RE_JUNK_REQUEST) &&
do_l7_retry(s, si_b) == 0)
return 0;
txn->status = 502;
s->si[1].flags |= SI_FL_NOLINGER;
htx_reply_and_close(s, txn->status, htx_error_message(s));

2
src/proxy.c
View File

@ -543,6 +543,8 @@ proxy_parse_retry_on(char **args, int section, struct proxy *curpx,
curpx->retry_type |= PR_RE_504;
else if (!strcmp(args[i], "0rtt-rejected"))
curpx->retry_type |= PR_RE_EARLY_ERROR;
else if (!strcmp(args[i], "junk-response"))
curpx->retry_type |= PR_RE_JUNK_REQUEST;
else if (!strcmp(args[i], "none")) {
if (i != 1 || *args[i + 1]) {
memprintf(err, "'%s' 'none' keyworld only usable alone", args[0]);