RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-19 12:10:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: connection/debug: do not enforce !event_type on subscribe() anymore

Browse Source 
When building with DEBUG_STRICT, there are still some BUG_ON(events&event_type)
in the subscribe() code which are not welcome anymore since we explicitly
permit to wake the caller up on readiness. This causes some regtests to fail
since 2c1f37d353 ("OPTIM: mux-h1: subscribe rather than waking up at a few
other places") when built with this option.

No backport is needed, this is 2.2-dev.
This commit is contained in:
Willy Tarreau 2020-03-05 07:41:20 +01:00
parent 2825b4b0ca
commit f4629a5346
5 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/mux_fcgi.c
View File

@ -3712,7 +3712,6 @@ static int fcgi_subscribe(struct conn_stream *cs, int event_type, struct wait_ev
struct fcgi_conn *fconn = fstrm->fconn;
BUG_ON(event_type & ~(SUB_RETRY_SEND|SUB_RETRY_RECV));
BUG_ON(fstrm->subs && fstrm->subs->events & event_type);
BUG_ON(fstrm->subs && fstrm->subs != es);
es->events |= event_type;

1
src/mux_h1.c
View File

@ -2587,7 +2587,6 @@ static int h1_subscribe(struct conn_stream *cs, int event_type, struct wait_even
return -1;
BUG_ON(event_type & ~(SUB_RETRY_SEND|SUB_RETRY_RECV));
BUG_ON(h1s->subs && h1s->subs->events & event_type);
BUG_ON(h1s->subs && h1s->subs != es);
es->events |= event_type;

1
src/mux_h2.c
View File

@ -5611,7 +5611,6 @@ static int h2_subscribe(struct conn_stream *cs, int event_type, struct wait_even
TRACE_ENTER(H2_EV_STRM_SEND|H2_EV_STRM_RECV, h2c->conn, h2s);
BUG_ON(event_type & ~(SUB_RETRY_SEND|SUB_RETRY_RECV));
BUG_ON(h2s->subs && h2s->subs->events & event_type);
BUG_ON(h2s->subs && h2s->subs != es);
es->events |= event_type;

1
src/ssl_sock.c
View File

@ -6473,7 +6473,6 @@ static int ssl_subscribe(struct connection *conn, void *xprt_ctx, int event_type
return -1;
BUG_ON(event_type & ~(SUB_RETRY_SEND|SUB_RETRY_RECV));
BUG_ON(ctx->subs && ctx->subs->events & event_type);
BUG_ON(ctx->subs && ctx->subs != es);
ctx->subs = es;

1
src/xprt_handshake.c
View File

@ -203,7 +203,6 @@ static int xprt_handshake_subscribe(struct connection *conn, void *xprt_ctx, int
struct xprt_handshake_ctx *ctx = xprt_ctx;
BUG_ON(event_type & ~(SUB_RETRY_SEND|SUB_RETRY_RECV));
BUG_ON(ctx->subs && ctx->subs->events & event_type);
BUG_ON(ctx->subs && ctx->subs != es);
ctx->subs = es;