diff --git a/Network/HTTP/Conduit/Downloader.hs b/Network/HTTP/Conduit/Downloader.hs --- a/Network/HTTP/Conduit/Downloader.hs +++ b/Network/HTTP/Conduit/Downloader.hs @@ -404,7 +404,7 @@ C.OverlongHeaders -> DRError "Overlong HTTP headers" C.ResponseTimeout -> DRError "Timeout" C.FailedConnectionException _host _port -> DRError "Connection failed" - C.FailedConnectionException2 _ _ _ _ -> DRError "Connection failed" + C.FailedConnectionException2 _ _ _ exn -> DRError $ "Connection failed: " ++ show exn C.InvalidDestinationHost _ -> DRError "Invalid destination host" C.HttpZlibException e -> DRError $ show e C.ExpectedBlankAfter100Continue -> DRError "Expected blank after 100 (Continue)" diff --git a/http-conduit-downloader.cabal b/http-conduit-downloader.cabal --- a/http-conduit-downloader.cabal +++ b/http-conduit-downloader.cabal @@ -1,6 +1,6 @@ cabal-version: >= 1.6 name: http-conduit-downloader -version: 1.0.21 +version: 1.0.22 author: Vladimir Shabanov maintainer: Vladimir Shabanov homepage: https://github.com/bazqux/http-conduit-downloader @@ -39,11 +39,20 @@ type: git location: https://github.com/bazqux/http-conduit-downloader +flag network-uri + description: Get Network.URI from the network-uri package + default: True + library build-depends: - base == 4.*, http-conduit >= 2.1.2.3, http-client >= 0.3.4, connection, network, zlib, lifted-base, - conduit, resourcet, http-types, data-default, bytestring, mtl, network-uri, + base == 4.*, http-conduit >= 2.1.2.3, http-client >= 0.3.4, connection, zlib, lifted-base, + conduit, resourcet, http-types, data-default, bytestring, mtl, time, old-locale, HsOpenSSL + + if flag(network-uri) + build-depends: network-uri >= 2.6, network >= 2.6 + else + build-depends: network-uri < 2.6, network < 2.6 exposed-modules: Network.HTTP.Conduit.Downloader