MINOR: mux-h1: Add flag on H1 stream to deal with internal errors
A new error is added on H1 stream to deal with internal errors. For now,
this error is only reported when we fail to create a stream-connector. This
way, the error is reported at the H1 stream level and not the H1 connection
level.
diff --git a/src/mux_h1.c b/src/mux_h1.c
index bf47985..3f7e102 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -1732,7 +1732,7 @@
h1m = (!(h1c->flags & H1C_F_IS_BACK) ? &h1s->req : &h1s->res);
data = htx->data;
- if (h1s->flags & (H1S_F_PARSING_ERROR|H1S_F_NOT_IMPL_ERROR))
+ if (h1s->flags & (H1S_F_INTERNAL_ERROR|H1S_F_PARSING_ERROR|H1S_F_NOT_IMPL_ERROR))
goto end;
if (h1s->flags & H1S_F_RX_BLK)
@@ -1850,7 +1850,7 @@
TRACE_DEVEL("request headers fully parsed, create and attach the SC", H1_EV_RX_DATA, h1c->conn, h1s);
BUG_ON(h1s_sc(h1s));
if (!h1s_new_sc(h1s, buf)) {
- h1c->flags |= H1C_F_ERROR;
+ h1s->flags |= H1S_F_INTERNAL_ERROR;
goto err;
}
}
@@ -1858,7 +1858,7 @@
TRACE_DEVEL("request headers fully parsed, upgrade the inherited SC", H1_EV_RX_DATA, h1c->conn, h1s);
BUG_ON(h1s_sc(h1s) == NULL);
if (!h1s_upgrade_sc(h1s, buf)) {
- h1c->flags |= H1C_F_ERROR;
+ h1s->flags |= H1S_F_INTERNAL_ERROR;
TRACE_ERROR("H1S upgrade failure", H1_EV_RX_DATA|H1_EV_H1S_ERR, h1c->conn, h1s);
goto err;
}
@@ -1953,7 +1953,7 @@
if (htx_is_empty(chn_htx))
goto end;
- if (h1s->flags & (H1S_F_PROCESSING_ERROR|H1S_F_TX_BLK))
+ if (h1s->flags & (H1S_F_INTERNAL_ERROR|H1S_F_PROCESSING_ERROR|H1S_F_TX_BLK))
goto end;
if (!h1_get_buf(h1c, &h1c->obuf)) {
@@ -2970,9 +2970,9 @@
h1_set_idle_expiration(h1c);
no_parsing:
- if (h1c->flags & H1C_F_ERROR) {
+ if (h1s->flags & H1S_F_INTERNAL_ERROR) {
h1_handle_internal_err(h1c);
- h1c->flags &= ~H1C_F_WAIT_NEXT_REQ;
+ h1c->flags = (h1c->flags & ~H1C_F_WAIT_NEXT_REQ) | H1C_F_ERROR;
TRACE_ERROR("internal error detected", H1_EV_H1C_WAKE|H1_EV_H1C_ERR);
}
else if (h1s->flags & H1S_F_NOT_IMPL_ERROR) {