Author: markt
Date: Tue Aug 18 16:32:12 2015
New Revision: 1696454
URL: http://svn.apache.org/r1696454
Log:
ConnectionSettings -> ConnectionSettingsRemote (the companion to
ConnectionSettingsLocal)
Added:
tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsRemote.java
- copied, changed from r1696452,
tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java
Removed:
tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java
Modified:
tomcat/trunk/java/org/apache/coyote/http2/AbstractStream.java
tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_2.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/AbstractStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/AbstractStream.java?rev=1696454&r1=1696453&r2=1696454&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/AbstractStream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/AbstractStream.java Tue Aug 18
16:32:12 2015
@@ -35,7 +35,7 @@ abstract class AbstractStream {
private volatile AbstractStream parentStream = null;
private final Set<AbstractStream> childStreams = new HashSet<>();
- private long windowSize = ConnectionSettings.DEFAULT_INITIAL_WINDOW_SIZE;
+ private long windowSize =
ConnectionSettingsRemote.DEFAULT_INITIAL_WINDOW_SIZE;
public Integer getIdentifier() {
return identifier;
Copied: tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsRemote.java
(from r1696452,
tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsRemote.java?p2=tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsRemote.java&p1=tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java&r1=1696452&r2=1696454&rev=1696454&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsRemote.java Tue
Aug 18 16:32:12 2015
@@ -20,13 +20,13 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
-public class ConnectionSettings {
+public class ConnectionSettingsRemote {
- private final Log log = LogFactory.getLog(ConnectionSettings.class);
- private final StringManager sm =
StringManager.getManager(ConnectionSettings.class);
+ private final Log log = LogFactory.getLog(ConnectionSettingsRemote.class);
+ private final StringManager sm =
StringManager.getManager(ConnectionSettingsRemote.class);
public static final int DEFAULT_INITIAL_WINDOW_SIZE = (1 << 16) - 1;
- private static final long UNLIMITED = ((long)1 << 32); // Use the maximum
possible
+ static final long UNLIMITED = ((long)1 << 32); // Use the maximum possible
private static final int MAX_WINDOW_SIZE = (1 << 31) - 1;
private static final int MIN_MAX_FRAME_SIZE = 1 << 14;
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java?rev=1696454&r1=1696453&r2=1696454&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java Tue Aug 18
16:32:12 2015
@@ -44,7 +44,7 @@ class Http2Parser {
private volatile int headersCurrentStream = -1;
private volatile boolean headersEndStream = false;
- private volatile int maxPayloadSize =
ConnectionSettings.DEFAULT_MAX_FRAME_SIZE;
+ private volatile int maxPayloadSize =
ConnectionSettingsRemote.DEFAULT_MAX_FRAME_SIZE;
Http2Parser(String connectionId, Input input, Output output) {
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=1696454&r1=1696453&r2=1696454&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Tue Aug
18 16:32:12 2015
@@ -114,8 +114,8 @@ public class Http2UpgradeHandler extends
new AtomicReference<>(ConnectionState.NEW);
private volatile long pausedNanoTime = Long.MAX_VALUE;
- private final ConnectionSettings remoteSettings = new ConnectionSettings();
- private final ConnectionSettings localSettings = new ConnectionSettings();
+ private final ConnectionSettingsRemote remoteSettings = new
ConnectionSettingsRemote();
+ private final ConnectionSettingsRemote localSettings = new
ConnectionSettingsRemote();
private HpackDecoder hpackDecoder;
private HpackEncoder hpackEncoder;
@@ -332,7 +332,7 @@ public class Http2UpgradeHandler extends
}
- ConnectionSettings getRemoteSettings() {
+ ConnectionSettingsRemote getRemoteSettings() {
return remoteSettings;
}
Modified: tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java?rev=1696454&r1=1696453&r2=1696454&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java (original)
+++ tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java Tue Aug 18
16:32:12 2015
@@ -356,7 +356,7 @@ public abstract class Http2TestBase exte
input = new TestInput(is);
output = new TestOutput();
parser = new Http2Parser("-1", input, output);
- hpackEncoder = new
HpackEncoder(ConnectionSettings.DEFAULT_HEADER_TABLE_SIZE);
+ hpackEncoder = new
HpackEncoder(ConnectionSettingsRemote.DEFAULT_HEADER_TABLE_SIZE);
}
@@ -662,7 +662,7 @@ public abstract class Http2TestBase exte
private StringBuffer trace = new StringBuffer();
private String lastStreamId = "0";
- private ConnectionSettings remoteSettings = new ConnectionSettings();
+ private ConnectionSettingsRemote remoteSettings = new
ConnectionSettingsRemote();
@Override
Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_2.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_2.java?rev=1696454&r1=1696453&r2=1696454&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_2.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_2.java Tue Aug
18 16:32:12 2015
@@ -35,7 +35,7 @@ public class TestHttp2Section_4_2 extend
// Overly large settings
// Settings have to be a multiple of six
- int settingsCount = (ConnectionSettings.DEFAULT_MAX_FRAME_SIZE / 6) +
1;
+ int settingsCount = (ConnectionSettingsRemote.DEFAULT_MAX_FRAME_SIZE /
6) + 1;
int size = settingsCount * 6;
byte[] settings = new byte[size + 9];
// Header
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
