mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

S3: Fix support for using https.

Browse source 
Was using the http-only Manager before, not the tls-capable one.
This commit is contained in:
Joey Hess 2015-10-15 10:37:06 -04:00
parent 45c9440cf9
commit c32a2429ed
Failed to extract signature
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Remote/S3.hs
View file

@ -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