You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2019/05/16 20:22:52 UTC

[tomcat] branch 8.5.x updated: Reduce default for maxConcurrentStreams from 200 to 100

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
     new 6b6104b  Reduce default for maxConcurrentStreams from 200 to 100
6b6104b is described below

commit 6b6104bffbc188c86a646cd548f32d4aa8f97d6d
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 0ced3b2..27449d4 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 eb4edf6..7133b44 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -70,6 +70,11 @@
         Fix concurrency issue that lead to incorrect HTTP/2 connection timeout.
         (remm/markt)
       </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 69d7c02..28579f0 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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org