upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-03-02 05:10:22 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

BUG/MEDIUM: http: tarpit timeout is reset

Browse source 
Before the commit bbba2a8ecc
(1.5-dev24-8), the tarpit section set timeout and return, after this
commit, the tarpit section set the timeout, and go to the "done" label
which reset the timeout.

Thanks Bryan Talbot for the bug report and analysis.

This should be backported in 1.5.
This commit is contained in:
Thierry FOURNIER 2014-08-22 06:55:26 +02:00 committed by Willy Tarreau
parent 90132726c5
commit 7566e30477
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/proto_http.c
View file

@ -4150,8 +4150,9 @@ int http_process_req_common(struct session *s, struct channel *req, int an_bit,
done: /* done with this analyser, continue with next ones that the calling
* points will have set, if any.
*/
req->analysers &= ~an_bit;
req->analyse_exp = TICK_ETERNITY;
done_without_exp: /* done with this analyser, but dont reset the analyse_exp. */
req->analysers &= ~an_bit;
return 1;
tarpit:
@ -4177,7 +4178,7 @@ int http_process_req_common(struct session *s, struct channel *req, int an_bit,
s->be->be_counters.denied_req++;
if (s->listener->counters)
s->listener->counters->denied_req++;
goto done;
goto done_without_exp;
deny: /* this request was blocked (denied) */
txn->flags |= TX_CLDENY;