From accd3e911c6952a52aaa79866b6c9d46d9022412 Mon Sep 17 00:00:00 2001 From: Christopher Faulet Date: Mon, 2 Oct 2023 08:34:33 +0200 Subject: [PATCH] MINOR: mux-h1: Rely on H1S_F_HAVE_CHNK to add T-E in outgoing messages If a message is declared to have a known length but no C-L or T-E headers are set, a "Transfer-Encoding; chunked" header is automatically added. It is useful for H2/H3 messages with no C-L header. There is now a flag to know this header was found or added. So we use it. --- src/mux_h1.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/mux_h1.c b/src/mux_h1.c index b715e76de..b3d2a619d 100644 --- a/src/mux_h1.c +++ b/src/mux_h1.c @@ -2172,6 +2172,7 @@ static size_t h1_make_headers(struct h1s *h1s, struct h1m *h1m, struct htx *htx, goto nextblk; if (h1_parse_xfer_enc_header(h1m, v) < 0) goto error; + h1s->flags |= H1S_F_HAVE_CHNK; } else if (isteq(n, ist("content-length"))) { if ((h1m->flags & H1_MF_RESP) && (h1s->status < 200 || h1s->status == 204)) @@ -2326,7 +2327,10 @@ static size_t h1_make_eoh(struct h1s *h1s, struct h1m *h1m, struct htx *htx, siz (h1s->status >= 200 && !(h1s->flags & H1S_F_BODYLESS_RESP) && !(h1s->meth == HTTP_METH_CONNECT && h1s->status >= 200 && h1s->status < 300) && (h1m->flags & (H1_MF_VER_11|H1_MF_RESP|H1_MF_CLEN|H1_MF_CHNK|H1_MF_XFER_LEN)) == - (H1_MF_VER_11|H1_MF_RESP|H1_MF_XFER_LEN))) { + (H1_MF_VER_11|H1_MF_RESP|H1_MF_XFER_LEN))) + h1m->flags |= H1_MF_CHNK; + + if ((h1m->flags & H1_MF_CHNK) && !(h1s->flags & H1S_F_HAVE_CHNK)) { /* chunking needed but header not seen */ n = ist("transfer-encoding"); v = ist("chunked"); @@ -2335,7 +2339,7 @@ static size_t h1_make_eoh(struct h1s *h1s, struct h1m *h1m, struct htx *htx, siz if (!h1_format_htx_hdr(n, v, &outbuf)) goto full; TRACE_STATE("add \"Transfer-Encoding: chunked\"", H1_EV_TX_DATA|H1_EV_TX_HDRS, h1c->conn, h1s); - h1m->flags |= H1_MF_CHNK; + h1s->flags |= H1S_F_HAVE_CHNK; } /* Add the server name to a header (if requested) */