From: Willy Tarreau <w@1wt.eu>
Date: Thu, 3 Jan 2019 10:41:50 +0000 (+0100)
Subject: MINOR: mux-h2: remove a misleading and impossible test
X-Git-Tag: v2.0-dev1~285
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3a429f04cbfb1e089ceb9311ee4d0d9ed3d647c4;p=thirdparty%2Fhaproxy.git

MINOR: mux-h2: remove a misleading and impossible test

In h2c_frt_handle_headers(), we test the stream for SS_ERROR just after
setting it to SS_OPEN, this makes no sense and creates confusion in the
error path. Remove this misleading test.
---

diff --git a/src/mux_h2.c b/src/mux_h2.c
index 3f8ae0d6c1..d74d514818 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -1917,15 +1917,9 @@ static struct h2s *h2c_frt_handle_headers(struct h2c *h2c, struct h2s *h2s)
 		h2s->cs->flags |= CS_FL_REOS;
 	}
 
-	if (h2s->st >= H2_SS_ERROR) {
-		/* stream error : send RST_STREAM */
-		h2c->st0 = H2_CS_FRAME_E;
-	}
-	else {
-		/* update the max stream ID if the request is being processed */
-		if (h2s->id > h2c->max_id)
-			h2c->max_id = h2s->id;
-	}
+	/* update the max stream ID if the request is being processed */
+	if (h2s->id > h2c->max_id)
+		h2c->max_id = h2s->id;
 
 	return h2s;