Author: markt
Date: Tue Sep 5 09:43:54 2017
New Revision: 1807327
URL: http://svn.apache.org/viewvc?rev=1807327&view=rev
Log:
Refactor: Configure local settings directly from protocol
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java?rev=1807327&r1=1807326&r2=1807327&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java Tue Sep 5
09:43:54 2017
@@ -105,9 +105,7 @@ public class Http2Protocol implements Up
? new Http2AsyncUpgradeHandler(this, adapter, coyoteRequest)
: new Http2UpgradeHandler(this, adapter, coyoteRequest);
- result.setMaxConcurrentStreams(getMaxConcurrentStreams());
result.setMaxConcurrentStreamExecution(getMaxConcurrentStreamExecution());
- result.setInitialWindowSize(getInitialWindowSize());
result.setAllowedTrailerHeaders(allowedTrailerHeaders);
result.setMaxHeaderCount(getMaxHeaderCount());
result.setMaxHeaderSize(getMaxHeaderSize());
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1807327&r1=1807326&r2=1807327&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Tue Sep
5 09:43:54 2017
@@ -156,6 +156,9 @@ class Http2UpgradeHandler extends Abstra
remoteSettings = new ConnectionSettingsRemote(connectionId);
localSettings = new ConnectionSettingsLocal(connectionId);
+ localSettings.set(Setting.MAX_CONCURRENT_STREAMS,
protocol.getMaxConcurrentStreams());
+ localSettings.set(Setting.INITIAL_WINDOW_SIZE,
protocol.getInitialWindowSize());
+
// Initial HTTP request becomes stream 1.
if (coyoteRequest != null) {
if (log.isDebugEnabled()) {
@@ -1125,21 +1128,11 @@ class Http2UpgradeHandler extends Abstra
// ------------------------------------------- Configuration
getters/setters
- public void setMaxConcurrentStreams(long maxConcurrentStreams) {
- localSettings.set(Setting.MAX_CONCURRENT_STREAMS,
maxConcurrentStreams);
- }
-
-
public void setMaxConcurrentStreamExecution(int
maxConcurrentStreamExecution) {
this.maxConcurrentStreamExecution = maxConcurrentStreamExecution;
}
- public void setInitialWindowSize(int initialWindowSize) {
- localSettings.set(Setting.INITIAL_WINDOW_SIZE, initialWindowSize);
- }
-
-
public void setAllowedTrailerHeaders(Set<String> allowedTrailerHeaders) {
this.allowedTrailerHeaders = allowedTrailerHeaders;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
