Skip to content
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

Jump to bottom

KTOR-4916 Fix recursion in deflate config #3193

Merged
merged 1 commit into from Oct 12, 2022
Merged

KTOR-4916 Fix recursion in deflate config #3193

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion ktor-shared/ktor-websockets/jvm/src/io/ktor/websocket/WebSocketDeflateExtension.kt
View file
Open in desktop
Expand Up @@ -173,8 +173,9 @@ public class WebSocketDeflateExtension internal constructor(
* Configure which protocols should send the client.
*/
public fun configureProtocols(block: (protocols: MutableList<WebSocketExtensionHeader>) -> Unit) {
val old = manualConfig
manualConfig = {
manualConfig(it)
old(it)
block(it)
}
}
Expand Down
12 changes: 12 additions & 0 deletions ktor-shared/ktor-websockets/jvm/test/WebSocketDeflateTest.kt
View file
Open in desktop
Expand Up @@ -60,4 +60,16 @@ class WebSocketDeflateTest {
assertEquals(extension.incomingNoContextTakeover, false)
assertEquals(extension.outgoingNoContextTakeover, true)
}

@Test
fun testManualConfig() {
val config = WebSocketDeflateExtension.Config()
config.manualConfig(mutableListOf())

config.configureProtocols {
it.add(WebSocketExtensionHeader("permessage-deflate", listOf("client_no_context_takeover")))
}

config.manualConfig(mutableListOf())
}
}