From f0c19d6674d792defc181333e20268b785ce4321 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Thu, 14 Mar 2024 13:25:50 +0100 Subject: Update Cowlib to 2.13.0 --- Makefile | 2 +- doc/src/manual/gun.asciidoc | 4 +++- ebin/gun.app | 1 + rebar.config | 2 +- src/gun.erl | 3 ++- src/gun_http2.erl | 2 ++ 6 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 4f166ec..cee6ce0 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ CT_OPTS += -ct_hooks gun_ct_hook [] # -boot start_sasl LOCAL_DEPS = ssl DEPS = cowlib -dep_cowlib = git https://github.com/ninenines/cowlib 2.12.1 +dep_cowlib = git https://github.com/ninenines/cowlib 2.13.0 DOC_DEPS = asciideck diff --git a/doc/src/manual/gun.asciidoc b/doc/src/manual/gun.asciidoc index d511fdc..60f217a 100644 --- a/doc/src/manual/gun.asciidoc +++ b/doc/src/manual/gun.asciidoc @@ -221,12 +221,13 @@ http2_opts() :: #{ max_connection_window_size => 0..16#7fffffff, max_decode_table_size => non_neg_integer(), max_encode_table_size => non_neg_integer(), + max_fragmented_header_block_size => 16384..16#7fffffff, max_frame_size_received => 16384..16777215, max_frame_size_sent => 16384..16777215 | infinity, - max_stream_buffer_size => non_neg_integer(), max_stream_window_size => 0..16#7fffffff, preface_timeout => timeout(), settings_timeout => timeout(), + stream_window_data_threshold => 0..16#7fffffff, stream_window_margin_size => 0..16#7fffffff, stream_window_update_threshold => 0..16#7fffffff } @@ -597,6 +598,7 @@ By default no user option is defined. == Changelog +* *2.1*: The HTTP/2 option list was updated with new options. * *2.0*: The `default_protocol` and `user_opts` Websocket options were added. * *2.0*: The `stream_ref()` type was added. diff --git a/ebin/gun.app b/ebin/gun.app index 8a516df..fdc9302 100644 --- a/ebin/gun.app +++ b/ebin/gun.app @@ -4,6 +4,7 @@ {modules, ['gun','gun_app','gun_conns_sup','gun_content_handler','gun_cookies','gun_cookies_list','gun_data_h','gun_default_event_h','gun_event','gun_http','gun_http2','gun_pool','gun_pool_events_h','gun_pools_sup','gun_protocols','gun_public_suffix','gun_raw','gun_socks','gun_sse_h','gun_sup','gun_tcp','gun_tcp_proxy','gun_tls','gun_tls_proxy','gun_tls_proxy_cb','gun_tls_proxy_http2_connect','gun_tunnel','gun_ws','gun_ws_h','gun_ws_protocol']}, {registered, [gun_sup]}, {applications, [kernel,stdlib,ssl,cowlib]}, + {optional_applications, []}, {mod, {gun_app, []}}, {env, []} ]}. \ No newline at end of file diff --git a/rebar.config b/rebar.config index c2022b9..e242d75 100644 --- a/rebar.config +++ b/rebar.config @@ -1,4 +1,4 @@ {deps, [ -{cowlib,".*",{git,"https://github.com/ninenines/cowlib","2.12.1"}} +{cowlib,".*",{git,"https://github.com/ninenines/cowlib","2.13.0"}} ]}. {erl_opts, [debug_info,warn_export_vars,warn_shadow_vars,warn_obsolete_guard]}. diff --git a/src/gun.erl b/src/gun.erl index db6965b..63f0ae8 100644 --- a/src/gun.erl +++ b/src/gun.erl @@ -237,12 +237,13 @@ max_concurrent_streams => non_neg_integer() | infinity, max_decode_table_size => non_neg_integer(), max_encode_table_size => non_neg_integer(), + max_fragmented_header_block_size => 16384..16#7fffffff, max_frame_size_received => 16384..16777215, max_frame_size_sent => 16384..16777215 | infinity, - max_stream_buffer_size => non_neg_integer(), max_stream_window_size => 0..16#7fffffff, preface_timeout => timeout(), settings_timeout => timeout(), + stream_window_data_threshold => 0..16#7fffffff, stream_window_margin_size => 0..16#7fffffff, stream_window_update_threshold => 0..16#7fffffff, diff --git a/src/gun_http2.erl b/src/gun_http2.erl index 4b35c76..71e01d4 100644 --- a/src/gun_http2.erl +++ b/src/gun_http2.erl @@ -160,11 +160,13 @@ do_check_options([Opt={Name, _}|Opts]) -> max_concurrent_streams, max_decode_table_size, max_encode_table_size, + max_fragmented_header_block_size, max_frame_size_received, max_frame_size_sent, max_stream_window_size, preface_timeout, settings_timeout, + stream_window_data_threshold, stream_window_margin_size, stream_window_update_threshold ], -- cgit v1.2.3