diff --git a/contrib/debug/flags.c b/contrib/debug/flags.c index dc4c04467..0e67155a8 100644 --- a/contrib/debug/flags.c +++ b/contrib/debug/flags.c @@ -97,7 +97,6 @@ void show_chn_flags(unsigned int f) SHOW_FLAG(f, CF_READ_NOEXP); SHOW_FLAG(f, CF_SHUTR_NOW); SHOW_FLAG(f, CF_SHUTR); - SHOW_FLAG(f, CF_WAKE_CONNECT); SHOW_FLAG(f, CF_READ_ERROR); SHOW_FLAG(f, CF_READ_TIMEOUT); SHOW_FLAG(f, CF_READ_PARTIAL); diff --git a/include/types/channel.h b/include/types/channel.h index 2d79c11f7..4bcc3b954 100644 --- a/include/types/channel.h +++ b/include/types/channel.h @@ -57,7 +57,7 @@ #define CF_READ_ERROR 0x00000008 /* unrecoverable error on producer side */ #define CF_READ_ACTIVITY (CF_READ_NULL|CF_READ_PARTIAL|CF_READ_ERROR) -#define CF_WAKE_CONNECT 0x00000010 /* wake the task up after connect succeeds */ +/* unused: 0x00000010 */ #define CF_SHUTR 0x00000020 /* producer has already shut down */ #define CF_SHUTR_NOW 0x00000040 /* the producer must shut down for reads ASAP */ #define CF_READ_NOEXP 0x00000080 /* producer should not expire */ diff --git a/src/cli.c b/src/cli.c index 9a9f80f90..ce33f60a3 100644 --- a/src/cli.c +++ b/src/cli.c @@ -2324,7 +2324,7 @@ int pcli_wait_for_response(struct stream *s, struct channel *rep, int an_bit) s->si[1].conn_retries = 0; /* used for logging too */ s->si[1].exp = TICK_ETERNITY; s->si[1].flags &= SI_FL_ISBACK | SI_FL_DONT_WAKE; /* we're in the context of process_stream */ - s->req.flags &= ~(CF_SHUTW|CF_SHUTW_NOW|CF_AUTO_CONNECT|CF_WRITE_ERROR|CF_STREAMER|CF_STREAMER_FAST|CF_NEVER_WAIT|CF_WAKE_CONNECT|CF_WROTE_DATA); + s->req.flags &= ~(CF_SHUTW|CF_SHUTW_NOW|CF_AUTO_CONNECT|CF_WRITE_ERROR|CF_STREAMER|CF_STREAMER_FAST|CF_NEVER_WAIT|CF_WROTE_DATA); s->res.flags &= ~(CF_SHUTR|CF_SHUTR_NOW|CF_READ_ATTACHED|CF_READ_ERROR|CF_READ_NOEXP|CF_STREAMER|CF_STREAMER_FAST|CF_WRITE_PARTIAL|CF_NEVER_WAIT|CF_WROTE_DATA|CF_READ_NULL); s->flags &= ~(SF_DIRECT|SF_ASSIGNED|SF_ADDR_SET|SF_BE_ASSIGNED|SF_FORCE_PRST|SF_IGNORE_PRST); s->flags &= ~(SF_CURR_SESS|SF_REDIRECTABLE|SF_SRV_REUSED); diff --git a/src/stream.c b/src/stream.c index 396100525..918da5e9d 100644 --- a/src/stream.c +++ b/src/stream.c @@ -905,15 +905,6 @@ static void sess_establish(struct stream *s) si->err_type = SI_ET_DATA_ERR; } - /* If the request channel is waiting for the connect(), we mark the read - * side as attached on the response channel and we wake up it once. So - * it will have a chance to forward data now. - */ - if (req->flags & CF_WAKE_CONNECT) { - req->flags |= CF_WAKE_ONCE; - req->flags &= ~CF_WAKE_CONNECT; - } - if (objt_server(s->target)) health_adjust(objt_server(s->target), HANA_STATUS_L4_OK);