From 5ef5e6a38111d12fd56de5f4b659e8271bf4030f Mon Sep 17 00:00:00 2001 From: Alyssa Wilk Date: Wed, 26 Sep 2018 10:44:34 -0400 Subject: [PATCH] adding an accessor for setting enable connect. Signed-off-by: Alyssa Wilk --- doc/CMakeLists.txt | 1 + doc/Makefile.am | 1 + lib/includes/nghttp2/nghttp2.h | 11 +++++++++++ lib/nghttp2_option.c | 5 +++++ 4 files changed, 18 insertions(+) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 34c02792..71ff3774 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -39,6 +39,7 @@ set(APIDOCS nghttp2_option_set_no_auto_ping_ack.rst nghttp2_option_set_no_auto_window_update.rst nghttp2_option_set_no_http_messaging.rst + nghttp2_option_set_enable_connect_protocol.rst nghttp2_option_set_no_recv_client_magic.rst nghttp2_option_set_peer_max_concurrent_streams.rst nghttp2_option_set_user_recv_extension_type.rst diff --git a/doc/Makefile.am b/doc/Makefile.am index 199c8952..548e7181 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -64,6 +64,7 @@ APIDOCS= \ nghttp2_option_set_no_auto_window_update.rst \ nghttp2_option_set_no_closed_streams.rst \ nghttp2_option_set_no_http_messaging.rst \ + nghttp2_option_set_enable_connect_protocol.rst \ nghttp2_option_set_no_recv_client_magic.rst \ nghttp2_option_set_peer_max_concurrent_streams.rst \ nghttp2_option_set_user_recv_extension_type.rst \ diff --git a/lib/includes/nghttp2/nghttp2.h b/lib/includes/nghttp2/nghttp2.h index e7198b3d..91a6720b 100644 --- a/lib/includes/nghttp2/nghttp2.h +++ b/lib/includes/nghttp2/nghttp2.h @@ -2534,6 +2534,17 @@ nghttp2_option_set_no_recv_client_magic(nghttp2_option *option, int val); NGHTTP2_EXTERN void nghttp2_option_set_no_http_messaging(nghttp2_option *option, int val); +/** + * @function + * + * By default, nghttp2 library does not allow the CONNECT method. For + * applications which wish to use CONNECT to allow websockets to traverse an + * HTTP/2 hop, give a nonzero |val| to enable CONNECT support. + * See `RFC 8441 `_ for details. + */ +NGHTTP2_EXTERN void nghttp2_option_set_enable_connect_protocol(nghttp2_option *option, + int val); + /** * @function * diff --git a/lib/nghttp2_option.c b/lib/nghttp2_option.c index 8946d7dd..c74fc7bd 100644 --- a/lib/nghttp2_option.c +++ b/lib/nghttp2_option.c @@ -59,6 +59,11 @@ void nghttp2_option_set_no_http_messaging(nghttp2_option *option, int val) { option->no_http_messaging = val; } +void nghttp2_option_set_enable_connect_protocol(nghttp2_option *option, int val) { + option->opt_set_mask |= NGHTTP2_SETTINGS_ENABLE_CONNECT_PROTOCOL; + option->no_http_messaging = val; +} + void nghttp2_option_set_max_reserved_remote_streams(nghttp2_option *option, uint32_t val) { option->opt_set_mask |= NGHTTP2_OPT_MAX_RESERVED_REMOTE_STREAMS;