From: Christopher Faulet <cfaulet@haproxy.com>
Date: Wed, 24 Oct 2018 09:15:09 +0000 (+0200)
Subject: MINOR: proto_htx: Adapt htx_process_tarpit to handle HTX messages
X-Git-Tag: v1.9-dev7~48
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8137c27094824061e649e7d5e19194e0682c73fc;p=thirdparty%2Fhaproxy.git

MINOR: proto_htx: Adapt htx_process_tarpit to handle HTX messages
---

diff --git a/src/proto_htx.c b/src/proto_htx.c
index 3594534326..8bf60fc9d1 100644
--- a/src/proto_htx.c
+++ b/src/proto_htx.c
@@ -984,11 +984,6 @@ int htx_process_tarpit(struct stream *s, struct channel *req, int an_bit)
 {
 	struct http_txn *txn = s->txn;
 
-	// TODO: Disabled for now
-	req->analyse_exp = TICK_ETERNITY;
-	req->analysers &= ~an_bit;
-	return 1;
-
 	/* This connection is being tarpitted. The CLIENT side has
 	 * already set the connect expiration date to the right
 	 * timeout. We just have to check that the client is still
@@ -1008,7 +1003,7 @@ int htx_process_tarpit(struct stream *s, struct channel *req, int an_bit)
 	s->logs.t_queue = tv_ms_elapsed(&s->logs.tv_accept, &now);
 
 	if (!(req->flags & CF_READ_ERROR))
-		http_reply_and_close(s, txn->status, http_error_message(s));
+		htx_reply_and_close(s, txn->status, http_error_message(s));
 
 	req->analysers &= AN_REQ_FLT_END;
 	req->analyse_exp = TICK_ETERNITY;