git.iko.soy/servant
on master help sign in
Merge branch 'tvh-support-tls'
commitcdbe95bcdf0e06bbed62a9cd125be71e7b431de4 authorChristian Marie <christian@ponies.io> dateMon 2 Feb 2015, 12:39 (12 years ago) parent6797a58015a6fe
4 files changed+6−1
compare with master
unifiedsplit
.travis.yml+2 servant-client.cabal+1 src/Servant/Common/Req.hs+2−1 test/Servant/ClientSpec.hs+1
.travis.yml+2
@@ -5,8 +5,10 @@ ghc:
55
66before_install:
77 - git clone https://github.com/haskell-servant/servant.git
8+ - git clone https://github.com/haskell-servant/servant-server.git
89 - cabal sandbox init
910 - cabal sandbox add-source servant/
11+ - cabal sandbox add-source servant-server/
1012
1113notifications:
1214 irc:
servant-client.cabal+1
@@ -44,6 +44,7 @@ library
4444 , either
4545 , exceptions
4646 , http-client
47+ , http-client-tls
4748 , http-types
4849 , network-uri >= 2.6
4950 , safe
src/Servant/Common/Req.hs+2−1
@@ -19,6 +19,7 @@ import Data.String.Conversions
1919import Data.Text
2020import Data.Text.Encoding
2121import Network.HTTP.Client
22+import Network.HTTP.Client.TLS
2223import Network.HTTP.Types
2324import Network.URI
2425import Servant.Common.BaseUrl
@@ -91,7 +92,7 @@ reqToRequest req (BaseUrl reqScheme reqHost reqPort) =
9192
9293{-# NOINLINE __manager #-}
9394__manager :: MVar Manager
94−__manager = unsafePerformIO (newManager defaultManagerSettings >>= newMVar)
95+__manager = unsafePerformIO (newManager tlsManagerSettings >>= newMVar)
9596
9697__withGlobalManager :: (Manager -> IO a) -> IO a
9798__withGlobalManager action = modifyMVar __manager $ \ manager -> do
test/Servant/ClientSpec.hs+1
@@ -253,3 +253,4 @@ pathGen = listOf $ elements $
253253 filter (not . (`elem` "?%[]/#")) $
254254 filter isPrint $
255255 map chr [0..127]
256+