From: Christopher Faulet <cfaulet@haproxy.com>
Date: Thu, 9 Sep 2021 12:51:26 +0000 (+0200)
Subject: CLEANUP: mux-h1: Remove condition rejecting upgrade requests with payload
X-Git-Tag: v2.5-dev7~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0fa8007102873337a8f95b97d2aa08af0992230b;p=thirdparty%2Fhaproxy.git

CLEANUP: mux-h1: Remove condition rejecting upgrade requests with payload

Now, "Upgrade:" header is removed from such requests. Thus, the condition to
reject them is now useless and can be removed. Code to handle unimplemented
features is now unused but is preserved for future uses.

This patch may be backported to 2.4.
---

diff --git a/src/mux_h1.c b/src/mux_h1.c
index 29ac930b06..729d761369 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -1535,14 +1535,6 @@ static size_t h1_process_demux(struct h1c *h1c, struct buffer *buf, size_t count
 			TRACE_USER((!(h1m->flags & H1_MF_RESP) ? "rcvd H1 request headers" : "rcvd H1 response headers"),
 				   H1_EV_RX_DATA|H1_EV_RX_HDRS, h1c->conn, h1s, htx, (size_t[]){ret});
 
-			/* Reject Protocol upgrade request with payload */
-			if ((h1m->flags & (H1_MF_RESP|H1_MF_CONN_UPG)) == H1_MF_CONN_UPG && h1m->state != H1_MSG_DONE) {
-				h1s->flags |= H1S_F_NOT_IMPL_ERROR;
-				TRACE_ERROR("Upgrade with body not implemented, reject H1 message",
-					    H1_EV_RX_DATA|H1_EV_RX_HDRS|H1_EV_H1S_ERR, h1s->h1c->conn, h1s);
-				break;
-			}
-
 			if ((h1m->flags & H1_MF_RESP) &&
 			    h1s->status < 200 && (h1s->status == 100 || h1s->status >= 102)) {
 				h1m_init_res(&h1s->res);