From 4d92c7d7c5ef00dc9132f1424f7e2fef66ccc019 Mon Sep 17 00:00:00 2001 From: Tommaso Piazza Date: Wed, 23 May 2018 07:44:00 +0200 Subject: [PATCH] Default endpoint override to port 443 if https and no port is specified --- Rome.cabal | 2 +- app/Main.hs | 2 +- src/Lib.hs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Rome.cabal b/Rome.cabal index e69ffc5..699dd37 100644 --- a/Rome.cabal +++ b/Rome.cabal @@ -1,5 +1,5 @@ name: Rome -version: 0.15.0.42 +version: 0.15.0.43 synopsis: An S3 cache for Carthage description: Please see README.md homepage: https://github.com/blender/Rome diff --git a/app/Main.hs b/app/Main.hs index f80b856..d7044b4 100644 --- a/app/Main.hs +++ b/app/Main.hs @@ -10,7 +10,7 @@ import System.Exit romeVersion :: RomeVersion -romeVersion = (0, 15, 0, 42) +romeVersion = (0, 15, 0, 43) diff --git a/src/Lib.hs b/src/Lib.hs index 0036a81..e1e827d 100644 --- a/src/Lib.hs +++ b/src/Lib.hs @@ -54,7 +54,7 @@ s3EndpointOverride :: URL -> AWS.Service s3EndpointOverride (URL (Absolute h) _ _) = let isSecure = secure h host' = host h - port' = port h + port' = port h <|> if isSecure then Just 443 else Nothing in AWS.setEndpoint isSecure (BS.pack host') (fromInteger $ fromMaybe 9000 port') S3.s3 s3EndpointOverride _ = S3.s3