eio: read_chunked now returns option

mirage · Jul 25, 2022 · bdbd7e3 · bdbd7e3
1 parent 978c822
commit bdbd7e3
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/cohttp-eio/src/client.ml b/cohttp-eio/src/client.ml
@@ -100,14 +100,9 @@ let patch ?version ?headers ?body env sw stream uri =
   call ~meth:`PATCH ?version ?headers ?body env sw stream uri
 
 (* Response Body *)
-<<<<<<< HEAD
 
 let read_fixed ((response, reader) : Http.Response.t * Buf_read.t) =
   Body.read_fixed reader response.headers
 
 let read_chunked : response -> (Body.chunk -> unit) -> Http.Header.t option =
  fun (response, reader) f -> Body.read_chunked reader response.headers f
-=======
-let read_fixed ((response, reader) : Http.Response.t * Reader.t) =
-  Body.read_fixed reader response.headers
->>>>>>> bd44e31b (eio(client): implement Client.read_fixed)