87 lines
3.2 KiB
Diff
87 lines
3.2 KiB
Diff
|
From d71a4668c6bead55805d18810d633fbb98315af9 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
|
||
|
|
Date: Sat, 9 Mar 2024 16:48:10 +0900
|
||
|
|
Subject: [PATCH] Add nghttp2_option_set_max_continuations
|
||
|
|
|
||
|
|
---
|
||
|
|
doc/Makefile.am | 1 +
|
||
|
|
lib/includes/nghttp2/nghttp2.h | 11 +++++++++++
|
||
|
|
lib/nghttp2_option.c | 5 +++++
|
||
|
|
lib/nghttp2_option.h | 5 +++++
|
||
|
|
lib/nghttp2_session.c | 4 ++++
|
||
|
|
5 files changed, 26 insertions(+)
|
||
|
|
|
||
|
|
Index: nghttp2-1.52.0/lib/includes/nghttp2/nghttp2.h
|
||
|
|
===================================================================
|
||
|
|
--- nghttp2-1.52.0.orig/lib/includes/nghttp2/nghttp2.h
|
||
|
|
+++ nghttp2-1.52.0/lib/includes/nghttp2/nghttp2.h
|
||
|
|
@@ -3215,6 +3215,17 @@ nghttp2_session_set_stream_user_data(ngh
|
||
|
|
/**
|
||
|
|
* @function
|
||
|
|
*
|
||
|
|
+ * This function sets the maximum number of CONTINUATION frames
|
||
|
|
+ * following an incoming HEADER frame. If more than those frames are
|
||
|
|
+ * received, the remote endpoint is considered to be misbehaving and
|
||
|
|
+ * session will be closed. The default value is 8.
|
||
|
|
+ */
|
||
|
|
+NGHTTP2_EXTERN void nghttp2_option_set_max_continuations(nghttp2_option *option,
|
||
|
|
+ size_t val);
|
||
|
|
+
|
||
|
|
+/**
|
||
|
|
+ * @function
|
||
|
|
+ *
|
||
|
|
* Sets |user_data| to |session|, overwriting the existing user data
|
||
|
|
* specified in `nghttp2_session_client_new()`, or
|
||
|
|
* `nghttp2_session_server_new()`.
|
||
|
|
Index: nghttp2-1.52.0/lib/nghttp2_option.c
|
||
|
|
===================================================================
|
||
|
|
--- nghttp2-1.52.0.orig/lib/nghttp2_option.c
|
||
|
|
+++ nghttp2-1.52.0/lib/nghttp2_option.c
|
||
|
|
@@ -143,3 +143,8 @@ void nghttp2_option_set_no_rfc9113_leadi
|
||
|
|
NGHTTP2_OPT_NO_RFC9113_LEADING_AND_TRAILING_WS_VALIDATION;
|
||
|
|
option->no_rfc9113_leading_and_trailing_ws_validation = val;
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+void nghttp2_option_set_max_continuations(nghttp2_option *option, size_t val) {
|
||
|
|
+ option->opt_set_mask |= NGHTTP2_OPT_MAX_CONTINUATIONS;
|
||
|
|
+ option->max_continuations = val;
|
||
|
|
+}
|
||
|
|
Index: nghttp2-1.52.0/lib/nghttp2_option.h
|
||
|
|
===================================================================
|
||
|
|
--- nghttp2-1.52.0.orig/lib/nghttp2_option.h
|
||
|
|
+++ nghttp2-1.52.0/lib/nghttp2_option.h
|
||
|
|
@@ -70,6 +70,7 @@ typedef enum {
|
||
|
|
NGHTTP2_OPT_MAX_SETTINGS = 1 << 12,
|
||
|
|
NGHTTP2_OPT_SERVER_FALLBACK_RFC7540_PRIORITIES = 1 << 13,
|
||
|
|
NGHTTP2_OPT_NO_RFC9113_LEADING_AND_TRAILING_WS_VALIDATION = 1 << 14,
|
||
|
|
+ NGHTTP2_OPT_MAX_CONTINUATIONS = 1 << 16,
|
||
|
|
} nghttp2_option_flag;
|
||
|
|
|
||
|
|
/**
|
||
|
|
@@ -93,6 +94,10 @@ struct nghttp2_option {
|
||
|
|
*/
|
||
|
|
size_t max_settings;
|
||
|
|
/**
|
||
|
|
+ * NGHTTP2_OPT_MAX_CONTINUATIONS
|
||
|
|
+ */
|
||
|
|
+ size_t max_continuations;
|
||
|
|
+ /**
|
||
|
|
* Bitwise OR of nghttp2_option_flag to determine that which fields
|
||
|
|
* are specified.
|
||
|
|
*/
|
||
|
|
Index: nghttp2-1.52.0/lib/nghttp2_session.c
|
||
|
|
===================================================================
|
||
|
|
--- nghttp2-1.52.0.orig/lib/nghttp2_session.c
|
||
|
|
+++ nghttp2-1.52.0/lib/nghttp2_session.c
|
||
|
|
@@ -574,6 +574,10 @@ static int session_new(nghttp2_session *
|
||
|
|
(*session_ptr)->opt_flags |=
|
||
|
|
NGHTTP2_OPTMASK_NO_RFC9113_LEADING_AND_TRAILING_WS_VALIDATION;
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ if (option->opt_set_mask & NGHTTP2_OPT_MAX_CONTINUATIONS) {
|
||
|
|
+ (*session_ptr)->max_continuations = option->max_continuations;
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
|
||
|
|
rv = nghttp2_hd_deflate_init2(&(*session_ptr)->hd_deflater,
|