From 2db5ffbf842e0aeb0ae11484b8c247bbfdcf5e9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= <essen@ninenines.eu>
Date: Sat, 28 Apr 2018 10:59:56 +0200
Subject: Add SETTINGS ack timeout and option settings_timeout

---
 doc/src/manual/cowboy_http2.asciidoc | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'doc/src/manual/cowboy_http2.asciidoc')

diff --git a/doc/src/manual/cowboy_http2.asciidoc b/doc/src/manual/cowboy_http2.asciidoc
index 47aa012..cd8ca68 100644
--- a/doc/src/manual/cowboy_http2.asciidoc
+++ b/doc/src/manual/cowboy_http2.asciidoc
@@ -30,6 +30,7 @@ opts() :: #{
     max_frame_size_sent            => 16384..16777215 | infinity,
     middlewares                    => [module()],
     preface_timeout                => timeout(),
+    settings_timeout               => timeout(),
     shutdown_timeout               => timeout(),
     stream_handlers                => [module()]
 }
@@ -105,6 +106,9 @@ middlewares ([cowboy_router, cowboy_handler])::
 preface_timeout (5000)::
     Time in ms Cowboy is willing to wait for the connection preface.
 
+settings_timeout (5000)::
+    Time in ms Cowboy is willing to wait for a SETTINGS ack.
+
 shutdown_timeout (5000)::
     Time in ms Cowboy will wait for child processes to shut down before killing them.
 
@@ -116,8 +120,9 @@ stream_handlers ([cowboy_stream_h])::
 * *2.4*: Add the options `initial_connection_window_size`,
          `initial_stream_window_size`, `max_concurrent_streams`,
          `max_decode_table_size`, `max_encode_table_size`,
-         `max_frame_size_received` and `max_frame_size_sent`
-         to configure HTTP/2 SETTINGS.
+         `max_frame_size_received`, `max_frame_size_sent`
+         and `settings_timeout` to configure HTTP/2 SETTINGS
+         and related behavior.
 * *2.4*: Add the experimental option `enable_connect_protocol`.
 * *2.0*: Protocol introduced.
 
-- 
cgit v1.2.3

