From: Christopher Faulet <cfaulet@haproxy.com>
Date: Tue, 16 Jul 2019 12:28:23 +0000 (+0200)
Subject: MINOR: hlua: Remove useless test on TX_CON_WANT_* flags
X-Git-Tag: v2.1-dev2~352
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=67bb3bb0c25aacd1040871fe5415ee68e1f00113;p=thirdparty%2Fhaproxy.git

MINOR: hlua: Remove useless test on TX_CON_WANT_* flags

When an HTTP applet is initialized, it is useless to force server-close mode on
the HTTP transaction because the connection mode is now handled by muxes. In
HTX, during analysis, the flag TX_CON_WANT_CLO is set by default in
htx_wait_for_request(), and TX_CON_WANT_SCL is never tested anywere.
---

diff --git a/src/hlua.c b/src/hlua.c
index 8c9b2b161e..78c6235128 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -6477,16 +6477,6 @@ static int hlua_applet_http_init(struct appctx *ctx, struct proxy *px, struct st
 	const char *error;
 
 	txn = strm->txn;
-
-	/* We want two things in HTTP mode :
-	 *  - enforce server-close mode if we were in keep-alive, so that the
-	 *    applet is released after each response ;
-	 *  - enable request body transfer to the applet in order to resync
-	 *    with the response body.
-	 */
-	if ((txn->flags & TX_CON_WANT_MSK) == TX_CON_WANT_KAL)
-		txn->flags = (txn->flags & ~TX_CON_WANT_MSK) | TX_CON_WANT_SCL;
-
 	hlua = pool_alloc(pool_head_hlua);
 	if (!hlua) {
 		SEND_ERR(px, "Lua applet http '%s': out of memory.\n",