Merge branch 'tvh-support-tls'

.travis.yml

@@ -5,8 +5,10 @@ ghc:
 
 before_install:
   - git clone https://github.com/haskell-servant/servant.git
+  - git clone https://github.com/haskell-servant/servant-server.git
   - cabal sandbox init
   - cabal sandbox add-source servant/
+  - cabal sandbox add-source servant-server/
 
 notifications:
   irc:

servant-client.cabal

@@ -44,6 +44,7 @@ library
     , either
     , exceptions
     , http-client
+    , http-client-tls
     , http-types
     , network-uri >= 2.6
     , safe

src/Servant/Common/Req.hs

@@ -19,6 +19,7 @@ import Data.String.Conversions
 import Data.Text
 import Data.Text.Encoding
 import Network.HTTP.Client
+import Network.HTTP.Client.TLS
 import Network.HTTP.Types
 import Network.URI
 import Servant.Common.BaseUrl
@@ -91,7 +92,7 @@ reqToRequest req (BaseUrl reqScheme reqHost reqPort) =
 
 {-# NOINLINE __manager #-}
 __manager :: MVar Manager
-__manager = unsafePerformIO (newManager defaultManagerSettings >>= newMVar)
+__manager = unsafePerformIO (newManager tlsManagerSettings >>= newMVar)
 
 __withGlobalManager :: (Manager -> IO a) -> IO a
 __withGlobalManager action = modifyMVar __manager $ \ manager -> do

test/Servant/ClientSpec.hs

@@ -253,3 +253,4 @@ pathGen = listOf $ elements $
   filter (not . (`elem` "?%[]/#")) $
   filter isPrint $
   map chr [0..127]
+