Revert default HTTP/2 settings sent by the client #2346
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Motivation: apple#2341 changed default HTTP/2 settings that client sends to notify the server it does not support Server Push. Modification: - Set `ENABLE_PUSH=0, MAX_CONCURRENT_STREAMS=0` in settings frame that client sends to a server; - Validate custom initial settings that users pass to `H2ProtocolConfig` and throw if users try to override ENABLE_PUSH/MAX_CONCURRENT_STREAMS on the client or set ENABLE_PUSH other than 0 for the server; - Include content message in GO_AWAY frame if client receives a Push Stream frame; Result: Default client behavior doesn't change, custom settings validated to prevent programming mistakes.
Scottmitch
approved these changes
Sep 9, 2022
| @@ -37,8 +38,7 @@ final class H2ClientParentChannelInitializer implements ChannelInitializer { | |||
|
|
|||
| H2ClientParentChannelInitializer(final H2ProtocolConfig config) { | |||
| this.config = config; | |||
| final io.servicetalk.http.api.Http2Settings h2Settings = config.initialSettings(); | |||
| nettySettings = toNettySettings(h2Settings); | |||
| nettySettings = toNettySettings(config.initialSettings()).pushEnabled(false).maxConcurrentStreams(0L); | |||
There was a problem hiding this comment.
If we set pushEnabled to false we don't really need to set maxConcurrentStreams
There was a problem hiding this comment.
Either way it doesn't hurt. This is what grpc-java does. Let's be consistent.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation:
#2341 changed default HTTP/2 settings that client sends to notify the server it does not support Server Push.
Modification:
ENABLE_PUSH=0, MAX_CONCURRENT_STREAMS=0in settings frame that client sends to a server;H2ProtocolConfigand throw if users try to override ENABLE_PUSH/MAX_CONCURRENT_STREAMS on the client or set ENABLE_PUSH other than 0 for the server;Result:
Default client behavior doesn't change, custom settings validated to prevent programming mistakes.