android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2026-01-17 08:42:25 +03:00
Code Releases Activity

Fix throwing with HTTP2 unknown settings frame id

Browse Source
This commit is contained in:
Eric Cochran
2016-01-29 13:27:25 -08:00
parent 38ddfedf09
commit 80b0bf4aa4
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
okhttp-tests/src/test/java/okhttp3/internal/framed/Http2Test.java
View File

@@ -18,6 +18,7 @@ package okhttp3.internal.framed;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import okhttp3.internal.Util;
import okio.Buffer;
import okio.BufferedSink;
@@ -268,7 +269,7 @@ public class Http2Test {
}
}
@Test public void readSettingsFrameInvalidSettingId() throws IOException {
@Test public void readSettingsFrameUnknownSettingId() throws IOException {
writeMedium(frame, 6); // 2 for the code and 4 for the value
frame.writeByte(Http2.TYPE_SETTINGS);
frame.writeByte(Http2.FLAG_NONE);
@@ -276,12 +277,13 @@ public class Http2Test {
frame.writeShort(7); // old number for SETTINGS_INITIAL_WINDOW_SIZE
frame.writeInt(1);
try {
fr.nextFrame(new BaseTestHandler());
fail();
} catch (IOException e) {
assertEquals("PROTOCOL_ERROR invalid settings id: 7", e.getMessage());
}
final AtomicInteger settingValue = new AtomicInteger();
fr.nextFrame(new BaseTestHandler() {
@Override public void settings(boolean clearPrevious, Settings settings) {
settingValue.set(settings.get(7));
}
});
assertEquals(settingValue.intValue(), 1);
}
@Test public void readSettingsFrameNegativeWindowSize() throws IOException {

2
okhttp/src/main/java/okhttp3/internal/framed/Http2.java
View File

@@ -294,7 +294,7 @@ public final class Http2 implements Variant {
case 6: // SETTINGS_MAX_HEADER_LIST_SIZE
break; // Advisory only, so ignored.
default:
throw ioException("PROTOCOL_ERROR invalid settings id: %s", id);
break; // Must ignore setting with unknown id.
}
settings.set(id, 0, value);
}