cdbe95b · servant · git.iko.soy

.travis.yml+2

compare with master

unifiedsplit

@@ -5,8 +5,10 @@ ghc:

5

6before_install:

7 - git clone https://github.com/haskell-servant/servant.git

8+ - git clone https://github.com/haskell-servant/servant-server.git

8 - cabal sandbox init

9 - cabal sandbox init

9 - cabal sandbox add-source servant/

10 - cabal sandbox add-source servant/

11+ - cabal sandbox add-source servant-server/

10

12

11notifications:

13notifications:

12 irc:

14 irc:

servant-client.cabal+1

@@ -44,6 +44,7 @@ library

44 , either

45 , exceptions

46 , http-client

47+ , http-client-tls

47 , http-types

48 , http-types

48 , network-uri >= 2.6

49 , network-uri >= 2.6

49 , safe

50 , safe

src/Servant/Common/Req.hs+2−1

@@ -19,6 +19,7 @@ import Data.String.Conversions

19import Data.Text

20import Data.Text.Encoding

21import Network.HTTP.Client

22+import Network.HTTP.Client.TLS

22import Network.HTTP.Types

23import Network.HTTP.Types

23import Network.URI

24import Network.URI

24import Servant.Common.BaseUrl

25import Servant.Common.BaseUrl

@@ -91,7 +92,7 @@ reqToRequest req (BaseUrl reqScheme reqHost reqPort) =

91

92

92{-# NOINLINE __manager #-}

93{-# NOINLINE __manager #-}

93__manager :: MVar Manager

94__manager :: MVar Manager

94−__manager = unsafePerformIO (newManager defaultManagerSettings >>= newMVar)

95+__manager = unsafePerformIO (newManager tlsManagerSettings >>= newMVar)

95

96

96__withGlobalManager :: (Manager -> IO a) -> IO a

97__withGlobalManager :: (Manager -> IO a) -> IO a

97__withGlobalManager action = modifyMVar __manager $ \ manager -> do

98__withGlobalManager action = modifyMVar __manager $ \ manager -> do

test/Servant/ClientSpec.hs+1

@@ -253,3 +253,4 @@ pathGen = listOf $ elements $

253 filter (not . (`elem` "?%[]/#")) $

254 filter isPrint $

255 map chr [0..127]

256+