This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push: new 4e80d59 Reduce default for maxConcurrentStreams from 200 to 100 4e80d59 is described below commit 4e80d590590b53b7c4e708ef30e640bdfec5ab2e Author: Mark Thomas <ma...@apache.org> AuthorDate: Thu May 16 21:21:19 2019 +0100 Reduce default for maxConcurrentStreams from 200 to 100 This aligns Tomcat with the typical default for HTTP/2 implementations. --- java/org/apache/coyote/http2/Http2Protocol.java | 2 +- webapps/docs/changelog.xml | 5 +++++ webapps/docs/config/http2.xml | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/java/org/apache/coyote/http2/Http2Protocol.java b/java/org/apache/coyote/http2/Http2Protocol.java index 1696e8b..127c759 100644 --- a/java/org/apache/coyote/http2/Http2Protocol.java +++ b/java/org/apache/coyote/http2/Http2Protocol.java @@ -47,7 +47,7 @@ public class Http2Protocol implements UpgradeProtocol { static final long DEFAULT_STREAM_READ_TIMEOUT = 20000; static final long DEFAULT_STREAM_WRITE_TIMEOUT = 20000; // The HTTP/2 specification recommends a minimum default of 100 - static final long DEFAULT_MAX_CONCURRENT_STREAMS = 200; + static final long DEFAULT_MAX_CONCURRENT_STREAMS = 100; // Maximum amount of streams which can be concurrently executed over // a single connection static final int DEFAULT_MAX_CONCURRENT_STREAM_EXECUTION = 20; diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index b756017..c1e6b03 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -127,6 +127,11 @@ <fix> NIO2 failed to properly close sockets on connector stop. (remm) </fix> + <update> + Reduce the default for <code>maxConcurrentStreams</code> on the + <code>Http2Protocol</code> from 200 to 100 to align with typical + defaults for HTTP/2 implementations. (markt) + </update> </changelog> </subsection> <subsection name="Cluster"> diff --git a/webapps/docs/config/http2.xml b/webapps/docs/config/http2.xml index 2748adf..ed5520b 100644 --- a/webapps/docs/config/http2.xml +++ b/webapps/docs/config/http2.xml @@ -142,7 +142,7 @@ <p>The controls the maximum number of active streams permitted for any one connection. If a client attempts to open more active streams than this limit, the stream will be reset with a <code>STREAM_REFUSED</code> error. - If not specified, the default value of <code>200</code> will be used.</p> + If not specified, the default value of <code>100</code> will be used.</p> </attribute> <attribute name="maxHeaderCount" required="false"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org