From 4228447e91ec2de484821120b5840616afc24b31 Mon Sep 17 00:00:00 2001
From: Timo von Holtz <tvh@anchor.com.au>
Date: Fri, 23 Jan 2015 09:18:13 +1100
Subject: [PATCH 1/2] Add TLS support

---
 servant-client.cabal      | 1 +
 src/Servant/Common/Req.hs | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/servant-client.cabal b/servant-client.cabal
index db546f28..2b17dc21 100644
--- a/servant-client.cabal
+++ b/servant-client.cabal
@@ -44,6 +44,7 @@ library
     , either
     , exceptions
     , http-client
+    , http-client-tls
     , http-types
     , network-uri >= 2.6
     , safe
diff --git a/src/Servant/Common/Req.hs b/src/Servant/Common/Req.hs
index d48e3905..71e2447a 100644
--- a/src/Servant/Common/Req.hs
+++ b/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

From 015a6feeea1d9083e44ca17a2169487d9e5af94c Mon Sep 17 00:00:00 2001
From: Timo von Holtz <tvh@tvholtz.de>
Date: Wed, 28 Jan 2015 21:00:28 +1100
Subject: [PATCH 2/2] Travis: use current HEAD of servant-server

---
 .travis.yml                | 2 ++
 test/Servant/ClientSpec.hs | 1 +
 2 files changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 41be6fa3..b303ae64 100644
--- a/.travis.yml
+++ b/.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:
diff --git a/test/Servant/ClientSpec.hs b/test/Servant/ClientSpec.hs
index b3e2b263..33fd8e40 100644
--- a/test/Servant/ClientSpec.hs
+++ b/test/Servant/ClientSpec.hs
@@ -246,3 +246,4 @@ pathGen = listOf $ elements $
   filter (not . (`elem` "?%[]/#")) $
   filter isPrint $
   map chr [0..127]
+