RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-02 03:23:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: stream-int: don't touch polling anymore on shutdown

Browse Source 
Not only it's become totally useless with muxes, in addition it's
dangerous to play with the mux's FD while shutting a stream down for
writes. It's already done *if necessary* by the cs_shutw() code at the
mux layer. Fortunately it doesn't seem to have any impact, most likely
the polling updates used to immediately revert this operation.
This commit is contained in:
Willy Tarreau 2020-12-11 10:24:05 +01:00
parent 5a1d439225
commit a5ea751922
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/stream_interface.c
View File

@ -1008,7 +1008,6 @@ static void stream_int_shutr_conn(struct stream_interface *si)
static void stream_int_shutw_conn(struct stream_interface *si)
{
struct conn_stream *cs = __objt_cs(si->end);
struct connection *conn = cs->conn;
struct channel *ic = si_ic(si);
struct channel *oc = si_oc(si);
@ -1056,14 +1055,9 @@ static void stream_int_shutw_conn(struct stream_interface *si)
*/
cs_shutw(cs, CS_SHW_NORMAL);
if (!(ic->flags & (CF_SHUTR|CF_DONT_READ))) {
/* OK just a shutw, but we want the caller
* to disable polling on this FD if exists.
*/
conn_cond_update_polling(conn);
if (!(ic->flags & (CF_SHUTR|CF_DONT_READ)))
return;
}
}
/* fall through */
case SI_ST_CON: