From: Christopher Faulet <cfaulet@haproxy.com>
Date: Tue, 21 Mar 2023 10:52:16 +0000 (+0100)
Subject: MINOR: applet: No longer set EOI on the SC
X-Git-Tag: v2.8-dev7~86
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=92297749e17ac7eb8b2c00262dd6619981d7be50;p=thirdparty%2Fhaproxy.git

MINOR: applet: No longer set EOI on the SC

Thanks to the previous patch, it is now possible for applets to not set the
CF_EOI flag on the channels. On this point, the applets get closer to the
muxes.
---

diff --git a/addons/promex/service-prometheus.c b/addons/promex/service-prometheus.c
index e4cc469ee5..bc88a7b093 100644
--- a/addons/promex/service-prometheus.c
+++ b/addons/promex/service-prometheus.c
@@ -1591,7 +1591,6 @@ static void promex_appctx_handle_io(struct appctx *appctx)
 				channel_add_input(res, 1);
 			}
 		        res_htx->flags |= HTX_FL_EOM;
-			res->flags |= CF_EOI;
 			se_fl_set(appctx->sedesc, SE_FL_EOI);
 			appctx->st0 = PROMEX_ST_END;
 			__fallthrough;
diff --git a/src/cache.c b/src/cache.c
index ae57ce544c..36ecf185aa 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -1526,7 +1526,6 @@ static void http_cache_io_handler(struct appctx *appctx)
 	if (appctx->st0 == HTX_CACHE_EOM) {
 		 /* no more data are expected. */
 		res_htx->flags |= HTX_FL_EOM;
-		res->flags |= CF_EOI;
 		se_fl_set(appctx->sedesc, SE_FL_EOI);
 		appctx->st0 = HTX_CACHE_END;
 	}
diff --git a/src/hlua.c b/src/hlua.c
index cc8624c50e..8cafff8b9d 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -9713,7 +9713,6 @@ void hlua_applet_http_fct(struct appctx *ctx)
 		}
 
 		res_htx->flags |= HTX_FL_EOM;
-		res->flags |= CF_EOI;
 		se_fl_set(ctx->sedesc, SE_FL_EOI);
 		strm->txn->status = http_ctx->status;
 		http_ctx->flags |= APPLET_RSP_SENT;
diff --git a/src/http_client.c b/src/http_client.c
index c146bd27eb..40d5ab6c8f 100644
--- a/src/http_client.c
+++ b/src/http_client.c
@@ -787,7 +787,6 @@ static void httpclient_applet_io_handler(struct appctx *appctx)
 
 					/* if the request contains the HTX_FL_EOM, we finished the request part. */
 					if (htx->flags & HTX_FL_EOM) {
-						req->flags |= CF_EOI;
 						se_fl_set(appctx->sedesc, SE_FL_EOI);
 						appctx->st0 = HTTPCLIENT_S_RES_STLINE;
 					}
diff --git a/src/stats.c b/src/stats.c
index 3e1b90b1f0..2bc471c6e1 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -4500,7 +4500,6 @@ static void http_stats_io_handler(struct appctx *appctx)
 			channel_add_input(res, 1);
 		}
 		res_htx->flags |= HTX_FL_EOM;
-		res->flags |= CF_EOI;
 		se_fl_set(appctx->sedesc, SE_FL_EOI);
 		appctx->st0 = STAT_HTTP_END;
 	}