KTOR-4419 Ignore request timeout for WebSocket requests #3062
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
e5l
changed the title
Stexxe
reviewed
Jun 20, 2022
ktor-client/ktor-client-tests/common/test/io/ktor/client/tests/WebSocketTest.kt
Outdated
Show resolved
Hide resolved
rsinukov
suggested changes
Jun 21, 2022
| * The request timeout is handled by the plugin and disabled for the WebSockets. | ||
| */ | ||
| val isWebSocket = request.url.protocol.isWebsocket() | ||
| if (request.getCapabilityOrNull(HttpTimeout) != null || isWebSocket || request.isUpgradeRequest()) { |
There was a problem hiding this comment.
can you explain why we do request.getCapabilityOrNull(HttpTimeout) != null here?
There was a problem hiding this comment.
CIO engine had timeouts before we had the HttpTimeout plugin. This place handles only the case when the plugin is not installed.
| fun testRequestTimeoutIgnoredWithWebSocket(): Unit = runBlocking { | ||
| val client = HttpClient(CIO) { | ||
| engine { | ||
| requestTimeout = 10 |
There was a problem hiding this comment.
let's make it shorted, to avoid running test for 20 seconds
| install(WebSockets) | ||
|
|
||
| install(HttpTimeout) { | ||
| requestTimeoutMillis = 10 |
rsinukov
approved these changes
Jun 21, 2022
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.
Fix KTOR-4419