Merge branch 'master' into return-connection-header

CHANGES.md

@@ -1,6 +1,7 @@
 ## Unreleased
 
 - cohttp-{lwt,eio}: server: return connection header (ushitora-anqou #1025)
+- cohttp-eio: client: use permissive argument type for make_generic
 - cohttp-eio: Improve error handling in example server (talex5 #1023)
 - cohttp-eio: Don't blow up `Server.callback` on client disconnections. (mefyl #1015)
 - http: Fix assertion in `Source.to_string_trim` when `pos <> 0` (mefyl #1017)

README.md

@@ -20,7 +20,7 @@ libraries:
   the GitHub bindings to JavaScript and still run efficiently.
 * `Cohttp_curl` uses `libcurl`, via `ocurl`, as backend. It also comes
   with lwt (`Cohttp_curl_lwt`) and async backends (`Cohttp_curl_async`).
-* `Cohttp_eio` uses `ei`o to leverage new features from multicore ocaml 5.0.
+* `Cohttp_eio` uses `eio` to leverage new features from multicore ocaml 5.0.
 
 You can implement other targets using the parser very easily. Look at the `IO`
 signature in `lib/s.mli` and implement that in the desired backend.

cohttp-eio/src/client.mli

@@ -24,6 +24,6 @@ val make :
     - URIs of the form "httpunix://unix-path/http-path" connect to the given
       Unix path. *)
 
-val make_generic : (sw:Switch.t -> Uri.t -> _ Eio.Net.stream_socket) -> t
+val make_generic : (sw:Switch.t -> Uri.t -> _ Eio.Flow.two_way) -> t
 (** [make_generic connect] is an HTTP client that uses [connect] to get the
     connection to use for a given URI. *)