Fix Jetty upgrade cancellation on connection close

ktorio · Feb 5, 2020 · 614f637 · 614f637
1 parent dfbcbeb
commit 614f637
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/ktor-server/ktor-server-jetty/jvm/src/io/ktor/server/jetty/internal/JettyUpgradeImpl.kt b/ktor-server/ktor-server-jetty/jvm/src/io/ktor/server/jetty/internal/JettyUpgradeImpl.kt
@@ -34,6 +34,17 @@ object JettyUpgradeImpl : ServletUpgrade {
         withContext(engineContext) {
             try {
                 coroutineScope {
+                    endPoint.connection.addListener(
+                        object : Connection.Listener {
+                            override fun onOpened(connection: Connection?) {
+                            }
+
+                            override fun onClosed(connection: Connection?) {
+                                cancel()
+                            }
+                        }
+                    )
+
                     val inputChannel = ByteChannel(autoFlush = true)
                     val reader = EndPointReader(endPoint, coroutineContext, inputChannel)
                     val writer = endPointWriter(endPoint)