mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-10 00:57:02 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: stconn: remove calls to cs_done_get()

Browse Source 
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.
This commit is contained in:
Willy Tarreau 2022-05-24 10:39:15 +02:00
parent a1547ce0a0
commit 516621bbe6
2 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/haproxy/conn_stream.h
View File

@ -411,10 +411,4 @@ static inline void cs_stop_get(struct stconn *cs)
sc_ep_clr(cs, SE_FL_WANT_GET); 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 */ #endif /* _HAPROXY_CONN_STREAM_H */

5
src/conn_stream.c
View File

@ -547,7 +547,6 @@ static void sc_app_shutw(struct stconn *cs)
return; return;
oc->flags |= CF_SHUTW; oc->flags |= CF_SHUTW;
oc->wex = TICK_ETERNITY; oc->wex = TICK_ETERNITY;
cs_done_get(cs);
if (tick_isset(cs->hcto)) { if (tick_isset(cs->hcto)) {
ic->rto = cs->hcto; ic->rto = cs->hcto;
@ -691,7 +690,6 @@ static void sc_app_shutw_conn(struct stconn *cs)
return; return;
oc->flags |= CF_SHUTW; oc->flags |= CF_SHUTW;
oc->wex = TICK_ETERNITY; oc->wex = TICK_ETERNITY;
cs_done_get(cs);
if (tick_isset(cs->hcto)) { if (tick_isset(cs->hcto)) {
ic->rto = cs->hcto; ic->rto = cs->hcto;
@ -919,7 +917,6 @@ static void sc_app_shutw_applet(struct stconn *cs)
return; return;
oc->flags |= CF_SHUTW; oc->flags |= CF_SHUTW;
oc->wex = TICK_ETERNITY; oc->wex = TICK_ETERNITY;
cs_done_get(cs);
if (tick_isset(cs->hcto)) { if (tick_isset(cs->hcto)) {
ic->rto = cs->hcto; ic->rto = cs->hcto;
@ -1274,8 +1271,6 @@ static void sc_conn_read0(struct stconn *cs)
oc->flags |= CF_SHUTW; oc->flags |= CF_SHUTW;
oc->wex = TICK_ETERNITY; oc->wex = TICK_ETERNITY;
cs_done_get(cs);
cs->state = SC_ST_DIS; cs->state = SC_ST_DIS;
__sc_strm(cs)->conn_exp = TICK_ETERNITY; __sc_strm(cs)->conn_exp = TICK_ETERNITY;
return; return;