From 855ccefe35a1f5cad4d15ee4d3b8abad2e42d14e Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Thu, 15 Apr 2021 18:46:02 +1000 Subject: [PATCH] Update dependencies --- Network/HTTP/Proxy.hs | 4 ++-- http-proxy.cabal | 17 ++++++++--------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Network/HTTP/Proxy.hs b/Network/HTTP/Proxy.hs index 7a426bf..2088798 100644 --- a/Network/HTTP/Proxy.hs +++ b/Network/HTTP/Proxy.hs @@ -41,7 +41,7 @@ module Network.HTTP.Proxy ) where -import Blaze.ByteString.Builder (fromByteString) +import Data.ByteString.Builder (byteString) import Control.Concurrent.Async (race_) import Control.Exception -- (SomeException, catch, toException) import Data.ByteString.Char8 (ByteString) @@ -197,7 +197,7 @@ doUpstreamRequest settings mgr respond mwreq } handle (respond . errorResponse) $ HC.withResponse hreq mgr $ \res -> do - let body = mapOutput (Chunk . fromByteString) . HCC.bodyReaderSource $ HC.responseBody res + let body = mapOutput (Chunk . byteString) . HCC.bodyReaderSource $ HC.responseBody res headers = (CI.mk "X-Via-Proxy", "yes") : filter dropResponseHeader (HC.responseHeaders res) respond $ responseSource (HC.responseStatus res) headers body where diff --git a/http-proxy.cabal b/http-proxy.cabal index 1838777..7ae1737 100644 --- a/http-proxy.cabal +++ b/http-proxy.cabal @@ -41,26 +41,25 @@ library build-depends: base >= 4 && < 5 , async == 2.2.* - , blaze-builder == 0.4.* - , bytestring == 0.10.* - , bytestring-lexing == 0.5.* - , case-insensitive == 1.2.* + , bytestring >= 0.10.8 + , bytestring-lexing >= 0.5 + , case-insensitive >= 1.2 , conduit == 1.3.* , conduit-extra == 1.3.* - , http-client == 0.6.* + , http-client == 0.7.* , http-conduit == 2.3.* , http-types == 0.12.* , mtl == 2.2.* - , network == 2.8.* + , network >= 3.1 , resourcet == 1.2.* , streaming-commons == 0.2.* - , tls == 1.4.* + , tls == 1.5.* , text == 1.2.* , transformers == 0.5.* , wai == 3.2.* , wai-conduit == 3.0.* - , warp == 3.2.* - , warp-tls == 3.2.* + , warp == 3.3.* + , warp-tls == 3.3.*