okhttp: ignore unknown HTTP/2 settings

ericgribkoff · ejona86 · commit 8fc367e83f34 · 2017-06-29T14:45:09.000-07:00
diff --git a/okhttp/third_party/okhttp/java/io/grpc/okhttp/internal/framed/Http2.java b/okhttp/third_party/okhttp/java/io/grpc/okhttp/internal/framed/Http2.java
@@ -301,7 +301,8 @@ private void readSettings(Handler handler, int length, byte flags, int streamId)
           case 6: // SETTINGS_MAX_HEADER_LIST_SIZE
             break; // Advisory only, so ignored.
           default:
-            throw ioException("PROTOCOL_ERROR invalid settings id: %s", id);
+            // Implementations MUST ignore any unknown or unsupported identifier.
+            continue;
         }
         settings.set(id, 0, value);
       }

Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,8 @@ private void readSettings(Handler handler, int length, byte flags, int streamId)`
`301`	`301`	`case 6: // SETTINGS_MAX_HEADER_LIST_SIZE`
`302`	`302`	`break; // Advisory only, so ignored.`
`303`	`303`	`default:`
`304`		`- throw ioException("PROTOCOL_ERROR invalid settings id: %s", id);`
	`304`	`+ // Implementations MUST ignore any unknown or unsupported identifier.`
	`305`	`+ continue;`
`305`	`306`	`}`
`306`	`307`	`settings.set(id, 0, value);`
`307`	`308`	`}`