From c6e8c6cf777d5af41c3141d41dae03808b13e24c Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Wed, 2 Nov 2022 22:19:03 +0100 Subject: [PATCH] update for the released http-mirage-client --- mirage/config.ml | 2 +- mirage/unikernel.ml | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mirage/config.ml b/mirage/config.ml index 6213c51..9510aa6 100644 --- a/mirage/config.ml +++ b/mirage/config.ml @@ -97,7 +97,7 @@ let tcp = tcpv4v6_of_stackv4v6 stack let http_client = let packages = - [ package ~pin:"git+https://git.robur.io/robur/http-mirage-client.git#main" "http-mirage-client" ] in + [ package "http-mirage-client" ] in let connect _ modname = function | [ _pclock; _tcpv4v6; ctx ] -> Fmt.str {ocaml|%s.connect %s|ocaml} modname ctx diff --git a/mirage/unikernel.ml b/mirage/unikernel.ml index 4c71f1d..57c3b30 100644 --- a/mirage/unikernel.ml +++ b/mirage/unikernel.ml @@ -717,11 +717,12 @@ stamp: %S incr idx; if !idx mod 10 = 0 then Gc.full_major () ; Logs.info (fun m -> m "downloading %s" url); - Http_mirage_client.one_request http_client url >>= function - | Ok (resp, Some str) -> + let body _response acc data = Lwt.return (acc ^ data) in + Http_mirage_client.request http_client url body "" >>= function + | Ok (resp, body) -> if resp.status = `OK then begin Logs.info (fun m -> m "downloaded %s" url); - Disk.write disk ~url str csums + Disk.write disk ~url body csums end else begin Logs.warn (fun m -> m "%s: %a (reason %s)" url H2.Status.pp_hum resp.status resp.reason);