Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .ocamlformat
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 0.18.0
version = 0.19.0
profile = conventional
break-infix = fit-or-vertical
parse-docstrings = true
Expand Down
1 change: 1 addition & 0 deletions conduit-mirage.opam
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ depends: [
"ipaddr" {>= "3.0.0"}
"ipaddr-sexp"
"tcpip" {with-test}
"fmt" {>= "0.8.7"}
]
conflicts: [
"mirage-conduit"
Expand Down
2 changes: 1 addition & 1 deletion src/conduit-lwt-unix/conduit_lwt_server.ml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,6 @@ let init ?(stop = fst (Lwt.wait ())) handler fd =
Log.warn (fun f ->
f "Uncaught exception accepting connection: %s"
(Printexc.to_string ex));
Lwt_unix.yield () >>= loop)
Lwt.pause () >>= loop)
in
Lwt.finalize loop (fun () -> Lwt_unix.close fd)
2 changes: 1 addition & 1 deletion src/conduit-lwt-unix/conduit_lwt_tls.dummy.ml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module X509 = struct

type authenticator = unit

let default_authenticator = ()
let default_authenticator = lazy ()
end

module Client = struct
Expand Down
2 changes: 1 addition & 1 deletion src/conduit-lwt-unix/conduit_lwt_tls.dummy.mli
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ module X509 : sig

type authenticator = unit

val default_authenticator : authenticator
val default_authenticator : authenticator Lazy.t
end

module Client : sig
Expand Down
2 changes: 1 addition & 1 deletion src/conduit-mirage/conduit_mirage.ml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ open Sexplib.Conv

let ( >>= ) = Lwt.( >>= )
let ( >|= ) = Lwt.( >|= )
let fail fmt = Fmt.kstrf (fun s -> Lwt.fail (Failure s)) fmt
let fail fmt = Fmt.kstr (fun s -> Lwt.fail (Failure s)) fmt
let err_tcp_not_supported = fail "%s: TCP is not supported"
let err_tls_not_supported = fail "%s: TLS is not supported"

Expand Down
3 changes: 2 additions & 1 deletion src/conduit-mirage/dune
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@
(wrapped false)
(libraries conduit conduit-lwt mirage-stack mirage-clock mirage-random
mirage-time mirage-flow mirage-flow-combinators dns-client.mirage
ipaddr-sexp vchan tls tls-mirage xenstore.client uri.services ca-certs-nss))
ipaddr-sexp vchan tls tls-mirage xenstore.client uri.services ca-certs-nss
fmt))