From: Willy Tarreau <w@1wt.eu>
Date: Thu, 3 Jan 2019 10:48:45 +0000 (+0100)
Subject: CLEANUP: mux-h2: clean the stream error path on HEADERS frame processing
X-Git-Tag: v2.0-dev1~284
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b8c4dd332040b4af97827e3c887b985e92d3af1d;p=thirdparty%2Fhaproxy.git

CLEANUP: mux-h2: clean the stream error path on HEADERS frame processing

In h2c_frt_handle_headers() and h2c_bck_handle_headers() we have an unused
error path made of the strm_err label, while send_rst is used to emit an
RST upon stream error after forcing the stream to h2_refused_stream. Let's
remove this unused strm_err block now.
---

diff --git a/src/mux_h2.c b/src/mux_h2.c
index d74d514818..59d76b7c3a 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -1927,13 +1927,6 @@ static struct h2s *h2c_frt_handle_headers(struct h2c *h2c, struct h2s *h2s)
 	h2c_error(h2c, error);
 	goto out;
 
- strm_err:
-	if (h2s) {
-		h2s_error(h2s, error);
-		h2c->st0 = H2_CS_FRAME_E;
-	}
-	else
-		h2c_error(h2c, error);
  out:
 	h2_release_buf(h2c, &rxbuf);
 	return NULL;
@@ -2003,15 +1996,6 @@ static struct h2s *h2c_bck_handle_headers(struct h2c *h2c, struct h2s *h2s)
  conn_err:
 	h2c_error(h2c, error);
 	return NULL;
-
- strm_err:
-	if (h2s) {
-		h2s_error(h2s, error);
-		h2c->st0 = H2_CS_FRAME_E;
-	}
-	else
-		h2c_error(h2c, error);
-	return NULL;
 }
 
 /* processes a DATA frame. Returns > 0 on success or zero on missing data.