diff --git a/build.sbt b/build.sbt index ba4fb0ec..590e5806 100644 --- a/build.sbt +++ b/build.sbt @@ -22,7 +22,7 @@ lazy val root = tlCrossRootProject.aggregate(servlet, examples) val asyncHttpClientVersion = "2.12.3" val jettyVersion = "10.0.15" -val http4sVersion = "0.23.18" +val http4sVersion = "0.23.19" val munitCatsEffectVersion = "1.0.7" val servletApiVersion = "4.0.1" diff --git a/servlet/src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala b/servlet/src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala index 97a09a24..67c2764d 100644 --- a/servlet/src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala +++ b/servlet/src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala @@ -76,6 +76,8 @@ class AsyncHttp4sServlet[F[_]] @deprecated("Use AsyncHttp4sServlet.builder", "0. dispatcher.unsafeRunAndForget(result) } catch errorHandler(servletRequest, servletResponse).andThen(dispatcher.unsafeRunSync _) + private[this] val noopCancelToken = Some(F.unit) + private def handleRequest( ctx: AsyncContext, request: Request[F], @@ -88,7 +90,7 @@ class AsyncHttp4sServlet[F[_]] @deprecated("Use AsyncHttp4sServlet.builder", "0. val timeout = F.async[Response[F]](cb => - gate.complete(ctx.addListener(new AsyncTimeoutHandler(cb))).as(Option.empty[F[Unit]]) + gate.complete(ctx.addListener(new AsyncTimeoutHandler(cb))).as(noopCancelToken) ) val response = gate.get *>