From: Willy Tarreau <w@1wt.eu>
Date: Mon, 23 Jul 2012 08:55:43 +0000 (+0200)
Subject: BUG/MINOR: tarpit: fix condition to return the HTTP 500 message
X-Git-Tag: v1.5-dev12~134
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dae2a8a5a542e8a166b7bbb2164c666334c9fcea;p=thirdparty%2Fhaproxy.git

BUG/MINOR: tarpit: fix condition to return the HTTP 500 message

Commit fa7e1025 (1.3.16-rc1) introduced a minor bug by comparing req->flags
with BF_READ_ERROR instead of checking for the bit. The result is that the
error message is always returned even in case of client error. This has no
real impact but this must be fixed.

It may be backported to 1.4 and 1.3.
---

diff --git a/src/proto_http.c b/src/proto_http.c
index 820f6434f2..7e1d738d87 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -3540,7 +3540,7 @@ int http_process_tarpit(struct session *s, struct buffer *req, int an_bit)
 	s->logs.t_queue = tv_ms_elapsed(&s->logs.tv_accept, &now);
 
 	txn->status = 500;
-	if (req->flags != BF_READ_ERROR)
+	if (!(req->flags & BF_READ_ERROR))
 		stream_int_retnclose(req->prod, error_message(s, HTTP_ERR_500));
 
 	req->analysers = 0;