diff --git a/dune-project b/dune-project index 0407b41f34..a93d82f117 100644 --- a/dune-project +++ b/dune-project @@ -93,7 +93,7 @@ (ocaml (>= 4.08)) (js_of_ocaml-compiler (= :version)) (ocamlfind (>= 1.5.1)) - (cohttp-lwt-unix :with-test) + (cohttp-lwt-unix (and (>= 6.0.0) :with-test)) (graphics :with-test) (num :with-test) (ppx_expect (and (>= v0.14.2) :with-test)) diff --git a/js_of_ocaml-toplevel.opam b/js_of_ocaml-toplevel.opam index 6e0e3d675c..820a523a19 100644 --- a/js_of_ocaml-toplevel.opam +++ b/js_of_ocaml-toplevel.opam @@ -16,7 +16,7 @@ depends: [ "ocaml" {>= "4.08"} "js_of_ocaml-compiler" {= version} "ocamlfind" {>= "1.5.1"} - "cohttp-lwt-unix" {with-test} + "cohttp-lwt-unix" {>= "6.0.0" & with-test} "graphics" {with-test} "num" {with-test} "ppx_expect" {>= "v0.14.2" & with-test} diff --git a/toplevel/examples/server/server.ml b/toplevel/examples/server/server.ml index d14cf2c229..4ddb58c8ad 100644 --- a/toplevel/examples/server/server.ml +++ b/toplevel/examples/server/server.ml @@ -31,7 +31,7 @@ let server () = >>= fun () -> Server.respond_file ~headers:header_plain_user_charset ~fname () with _ -> (* send static file *) - let fname = Server.resolve_file ~docroot:"." ~uri in + let fname = Path.resolve_local_file ~docroot:"." ~uri in Lwt_io.eprintf "static: %s\n" fname >>= fun () -> let headers =