Skip to content

Upgrade to http4s-0.23.19 #194

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

Merged
rossabaker merged 3 commits into from
May 14, 2023
Merged

Upgrade to http4s-0.23.19 #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee599cb
Update http4s-dsl, http4s-server to 0.23.19 in series/0.24
http4s-steward[bot] May 12, 2023
9752c9f
Make AsyncTimeoutHandler installation cancelable in cats-effect-3.5.0
rossabaker May 14, 2023
e957b64
Merge branch 'series/0.24' into http4s-0.23.19
rossabaker May 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 3 additions & 1 deletion servlet/src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand All @@ -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 *>
Expand Down