From: Willy Tarreau <w@1wt.eu>
Date: Tue, 24 May 2022 08:39:15 +0000 (+0200)
Subject: MINOR: stconn: remove calls to cs_done_get()
X-Git-Tag: v2.6-dev12~66
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=516621bbe6fb0ec0bacadac6813467628be9dfdc;p=thirdparty%2Fhaproxy.git

MINOR: stconn: remove calls to cs_done_get()

It was only called after setting SHUTW on the output channel, and since
it's now handled by sc_is_send_allowed() we don't need it anymore.
---

diff --git a/include/haproxy/conn_stream.h b/include/haproxy/conn_stream.h
index 5bfffd9c28..3faaebc007 100644
--- a/include/haproxy/conn_stream.h
+++ b/include/haproxy/conn_stream.h
@@ -411,10 +411,4 @@ static inline void cs_stop_get(struct stconn *cs)
 	sc_ep_clr(cs, SE_FL_WANT_GET);
 }
 
-/* Report that a stream connector won't get any more data from the output buffer */
-static inline void cs_done_get(struct stconn *cs)
-{
-	sc_ep_clr(cs, SE_FL_WANT_GET | SE_FL_WAIT_DATA);
-}
-
 #endif /* _HAPROXY_CONN_STREAM_H */
diff --git a/src/conn_stream.c b/src/conn_stream.c
index e3c2066802..3d68625ec5 100644
--- a/src/conn_stream.c
+++ b/src/conn_stream.c
@@ -547,7 +547,6 @@ static void sc_app_shutw(struct stconn *cs)
 		return;
 	oc->flags |= CF_SHUTW;
 	oc->wex = TICK_ETERNITY;
-	cs_done_get(cs);
 
 	if (tick_isset(cs->hcto)) {
 		ic->rto = cs->hcto;
@@ -691,7 +690,6 @@ static void sc_app_shutw_conn(struct stconn *cs)
 		return;
 	oc->flags |= CF_SHUTW;
 	oc->wex = TICK_ETERNITY;
-	cs_done_get(cs);
 
 	if (tick_isset(cs->hcto)) {
 		ic->rto = cs->hcto;
@@ -919,7 +917,6 @@ static void sc_app_shutw_applet(struct stconn *cs)
 		return;
 	oc->flags |= CF_SHUTW;
 	oc->wex = TICK_ETERNITY;
-	cs_done_get(cs);
 
 	if (tick_isset(cs->hcto)) {
 		ic->rto = cs->hcto;
@@ -1274,8 +1271,6 @@ static void sc_conn_read0(struct stconn *cs)
 	oc->flags |= CF_SHUTW;
 	oc->wex = TICK_ETERNITY;
 
-	cs_done_get(cs);
-
 	cs->state = SC_ST_DIS;
 	__sc_strm(cs)->conn_exp = TICK_ETERNITY;
 	return;