From d6975dbc98da9dee752222d6e4535d70f36809a1 Mon Sep 17 00:00:00 2001 From: Jaidyn Ann Date: Mon, 16 Nov 2020 19:19:37 -0600 Subject: [PATCH] Switch from BHttpRequest to BProtocolRoster for requests --- src/Util.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/Util.cpp b/src/Util.cpp index fbc5849..531fdf6 100644 --- a/src/Util.cpp +++ b/src/Util.cpp @@ -3,7 +3,9 @@ #include #include #include -#include +#include +#include +#include #include #include "ProtocolListener.h" #include "Util.h" @@ -98,19 +100,18 @@ int32 webFetch ( BUrl url, BDataIO* reply, BString* hash ) { ProtocolListener listener(true); - BUrlContext context; boost::uuids::detail::sha1 sha1; - BHttpRequest request( url, true, "HTTP", &listener, &context ); + BUrlRequest* request = BUrlProtocolRoster::MakeRequest( url, &listener ); listener.SetDownloadIO( reply ); listener.SetSha1( &sha1 ); - thread_id thread = request.Run(); + thread_id thread = request->Run(); wait_for_thread( thread, NULL ); *(hash) = listener.GetHash(); - const BHttpResult& result = dynamic_cast( request.Result() ); - return result.StatusCode(); + return request->Status(); + return 200; }