Compatibility with eio.0.13 and cohttp-eio.6.0.0

This sets lower bounds for eio and ensure compatibility with a wider
range of versions.

Author: Julow

dune-project

@@ -18,11 +18,11 @@
  (depends
   (ocaml (>= 4.08.1))
   (camlzip (>= 1.04))
-  cohttp-eio
+  (cohttp-eio (>= 6.0.0))
   http
   cryptokit
   (ipaddr (>= 2.1))
-  eio
+  (eio (>= 0.13))
   eio_main
   lwt_react
   lwt_ssl

ocsigenserver.opam

@@ -13,11 +13,11 @@ depends: [
   "dune" {>= "3.19"}
   "ocaml" {>= "4.08.1"}
   "camlzip" {>= "1.04"}
-  "cohttp-eio"
+  "cohttp-eio" {>= "6.0.0"}
   "http"
   "cryptokit"
   "ipaddr" {>= "2.1"}
-  "eio"
+  "eio" {>= "0.13"}
   "eio_main"
   "lwt_react"
   "lwt_ssl"

src/baselib/ocsigen_stream.ml

@@ -219,7 +219,7 @@ let of_file filename =
     (Eio_unix.Net.import_socket_stream
        ~sw:(Stdlib.Option.get (Fiber.get Ocsigen_lib.current_switch))
        ~close_unix:true fd
-     : [`R | `Flow | `Close] r)
+      :> [`R | `Flow | `Close] r)
   in
   let buf = Cstruct.create 1024 in
   let rec aux () =

src/server/ocsigen_server.ml

@@ -286,7 +286,7 @@ let main config =
            |> fun x1 ->
            Eio.Buf_read.of_flow ~max_size:1_000_000
              (Eio_unix.Net.import_socket_stream ~sw ~close_unix:true x1
-              : [`R | `Flow | `Close] r)
+               :> [`R | `Flow | `Close] r)
          in
          let rec f () =
            let s = Eio.Buf_read.line pipe in
@@ -362,7 +362,7 @@ let main config =
     let run () =
       Eio_main.run (fun env ->
         Fiber.with_binding Ocsigen_lib.env env (fun () ->
-          Switch.run ~name:"main" (fun sw ->
+          Switch.run (fun sw ->
             Fiber.with_binding Ocsigen_lib.current_switch sw run)))
     in
     (* set_passwd_if_needed sslinfo; *)