From: Amaury Denoyelle <adenoyelle@haproxy.com>
Date: Thu, 9 Jun 2022 09:51:01 +0000 (+0200)
Subject: BUG/MINOR: h3: fix frame type definition
X-Git-Tag: v2.7-dev1~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c715eb78988b4ad75caad685a35b671027b5a19f;p=thirdparty%2Fhaproxy.git

BUG/MINOR: h3: fix frame type definition

Frame type has changed during HTTP/3 specification process. Adjust it to
reflect the latest RFC 9114 status.

Concretly, type for GOAWAY and MAX_PUSH_ID frames has been adjusted.
The impact of this bug is limited as currently these frames are not
handled by haproxy and are ignored.

This can be backported up to 2.6.
---

diff --git a/include/haproxy/h3.h b/include/haproxy/h3.h
index 7c66714826..5953da6148 100644
--- a/include/haproxy/h3.h
+++ b/include/haproxy/h3.h
@@ -77,12 +77,14 @@ enum h3_err {
 enum h3_ft       {
 	H3_FT_DATA         = 0x00,
 	H3_FT_HEADERS      = 0x01,
-	/* There is a hole here */
+	/* hole */
 	H3_FT_CANCEL_PUSH  = 0x03,
 	H3_FT_SETTINGS     = 0x04,
 	H3_FT_PUSH_PROMISE = 0x05,
-	H3_FT_GOAWAY       = 0x06,
-	H3_FT_MAX_PUSH_ID  = 0x07,
+	/* hole */
+	H3_FT_GOAWAY       = 0x07,
+	/* hole */
+	H3_FT_MAX_PUSH_ID  = 0x0d,
 };
 
 /* Stream types */