Skip to content

Do not alter connection flow-control window on SETTINGS frame. #3920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 20, 2018
Merged

Do not alter connection flow-control window on SETTINGS frame. #3920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions okhttp-tests/src/test/java/okhttp3/internal/http2/Http2ConnectionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ public final class Http2ConnectionTest {
Http2Stream stream = connection.newStream(headerEntries("a", "android"), false);

assertEquals(3368, connection.peerSettings.getInitialWindowSize());
assertEquals(1684, connection.bytesLeftInWriteWindow); // initial wasn't affected.
// New Stream is has the most recent initial window size.
assertEquals(3368, stream.bytesLeftInWriteWindow);
}
Expand Down Expand Up @@ -1234,7 +1233,6 @@ public final class Http2ConnectionTest {
peer.sendFrame().ping(true, 1, 0);
peer.acceptFrame(); // SYN_STREAM
peer.sendFrame().synReply(false, 3, headerEntries("a", "android"));
peer.sendFrame().windowUpdate(3, 5);
peer.acceptFrame(); // PING
peer.sendFrame().ping(true, 3, 0);
peer.acceptFrame(); // DATA
Expand Down
9 changes: 0 additions & 9 deletions okhttp/src/main/java/okhttp3/internal/http2/Http2Connection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,14 +312,6 @@ public void writeData(int streamId, boolean outFinished, Buffer buffer, long byt
}
}

/**
* {@code delta} will be negative if a settings frame initial window is smaller than the last.
*/
void addBytesToWriteWindow(long delta) {
bytesLeftInWriteWindow += delta;
if (delta > 0) Http2Connection.this.notifyAll();
}

void writeSynResetLater(final int streamId, final ErrorCode errorCode) {
try {
writerExecutor.execute(new NamedRunnable("OkHttp %s stream %d", hostname, streamId) {
Expand Down Expand Up @@ -709,7 +701,6 @@ class ReaderRunnable extends NamedRunnable implements Http2Reader.Handler {
if (peerInitialWindowSize != -1 && peerInitialWindowSize != priorWriteWindowSize) {
delta = peerInitialWindowSize - priorWriteWindowSize;
if (!receivedInitialPeerSettings) {
addBytesToWriteWindow(delta);
receivedInitialPeerSettings = true;
}
if (!streams.isEmpty()) {
Expand Down