From 36354538db9d288bc7b8eb31b4bd2799d1d67b61 Mon Sep 17 00:00:00 2001 From: mefyl Date: Fri, 5 Jan 2024 12:46:03 +0100 Subject: [PATCH 1/2] cohttp-lwt: Preserve extended signature of `IO` in `Server.S`. --- cohttp-lwt/src/s.ml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cohttp-lwt/src/s.ml b/cohttp-lwt/src/s.ml index a834e7965..1cbe255b1 100644 --- a/cohttp-lwt/src/s.ml +++ b/cohttp-lwt/src/s.ml @@ -223,7 +223,8 @@ end (** The [Server] module implements a pipelined HTTP/1.1 server. *) module type Server = sig - include Cohttp.Generic.Server.S with type body = Body.t and type 'a IO.t = 'a Lwt.t + module IO : IO + include Cohttp.Generic.Server.S with type body = Body.t and module IO := IO val resolve_local_file : docroot:string -> uri:Uri.t -> string [@@deprecated "Please use Cohttp.Path.resolve_local_file. "] From e87e223c2fd1b1c4eca8f31fd2daaa418f9d568b Mon Sep 17 00:00:00 2001 From: mefyl Date: Fri, 5 Jan 2024 12:50:42 +0100 Subject: [PATCH 2/2] Changelog. --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index f24c2f780..c5aaa2a04 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,6 +2,7 @@ - cohttp-eio: Don't blow up Server on client disconnections. (mefyl #1011) - cohttp-eio: Match body encoding with headers. (mefyl #1012) +- cohttp-lwt: Preserve extended `Server.S.IO` signature. (mefyl #1013) ## v6.0.0~beta1 (2023-10-27) - cohttp-eio: move new Cohttp.{Client,Server} modules under Cohttp.Generic (mseri #1003)