diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-10-15 10:37:06 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-10-15 10:37:06 -0400 |
| commit | c7a479b53f48fac2c5f26d786f2aa8fcca0a1046 (patch) | |
| tree | b3863da2c6845ce6495e5885bf26c868446bad54 | |
| parent | b00e84255446aceab5fc0c941c115e71276f8a5e (diff) | |
S3: Fix support for using https.
Was using the http-only Manager before, not the tls-capable one.
| -rw-r--r-- | Remote/S3.hs | 6 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Remote/S3.hs b/Remote/S3.hs index d381e0b72..fa88b84bc 100644 --- a/Remote/S3.hs +++ b/Remote/S3.hs @@ -22,7 +22,7 @@ import qualified Data.Map as M import Data.Char import Network.Socket (HostName) import Network.HTTP.Conduit (Manager, newManager) -import Network.HTTP.Client (defaultManagerSettings, managerResponseTimeout, responseStatus, responseBody, RequestBody(..)) +import Network.HTTP.Client (managerResponseTimeout, responseStatus, responseBody, RequestBody(..)) import Network.HTTP.Types import Control.Monad.Trans.Resource import Control.Monad.Catch @@ -48,7 +48,7 @@ import Utility.Metered import Utility.DataUnits import Annex.Content import Annex.Url (withUrlOptions) -import Utility.Url (checkBoth, closeManager) +import Utility.Url (checkBoth, managerSettings, closeManager) type BucketName = String @@ -418,7 +418,7 @@ withS3HandleMaybe c u a = do Nothing -> a Nothing where s3cfg = s3Configuration c - httpcfg = defaultManagerSettings + httpcfg = managerSettings { managerResponseTimeout = Nothing } s3Configuration :: RemoteConfig -> S3.S3Configuration AWS.NormalQuery diff --git a/debian/changelog b/debian/changelog index a0011687d..709ae893c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,11 +35,11 @@ git-annex (5.20150931) UNRELEASED; urgency=medium Fixed this bug, which was introduced in version 5.20150727. * Avoid unncessary write to the location log when a file is unlocked and then added back with unchanged content. + * S3: Fix support for using https. * Debian: Add torrent library to build-depends as it's packaged now, and stop recommending bittornado | bittorrent. * Debian: Remove dependency on transformers library, as it is now included in ghc. - * -- Joey Hess <id@joeyh.name> Thu, 01 Oct 2015 12:42:56 -0400 |