eeva/servant
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

support http-client-0.5

Browse source
This commit is contained in:
Sönke Hahn 2016-07-09 13:31:58 +02:00
parent a7a3294752
commit d45c7c5897
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
servant-client/servant-client.cabal
View file

@ -42,8 +42,8 @@ library
, bytestring >= 0.10 && < 0.11 , bytestring >= 0.10 && < 0.11
, exceptions >= 0.8 && < 0.9 , exceptions >= 0.8 && < 0.9
, http-api-data >= 0.1 && < 0.3 , http-api-data >= 0.1 && < 0.3
, http-client >= 0.4.18.1 && < 0.5 , http-client >= 0.4.18.1 && < 0.6
, http-client-tls >= 0.2.2 && < 0.3 , http-client-tls >= 0.2.2 && < 0.4
, http-media >= 0.6.2 && < 0.7 , http-media >= 0.6.2 && < 0.7
, http-types >= 0.8.6 && < 0.10 , http-types >= 0.8.6 && < 0.10
, network-uri >= 2.6 && < 2.7 , network-uri >= 2.6 && < 2.7

11
servant-client/src/Servant/Common/Req.hs
View file

@ -147,9 +147,8 @@ performRequest :: Method -> Req -> Manager -> BaseUrl
performRequest reqMethod req manager reqHost = do performRequest reqMethod req manager reqHost = do
partialRequest <- liftIO $ reqToRequest req reqHost partialRequest <- liftIO $ reqToRequest req reqHost
let request = partialRequest { Client.method = reqMethod let request = disableStatusCheck $
, checkStatus = \ _status _headers _cookies -> Nothing partialRequest { Client.method = reqMethod }
}
eResponse <- liftIO $ catchConnectionError $ Client.httpLbs request manager eResponse <- liftIO $ catchConnectionError $ Client.httpLbs request manager
case eResponse of case eResponse of
@ -170,6 +169,12 @@ performRequest reqMethod req manager reqHost = do
throwE $ FailureResponse status ct body throwE $ FailureResponse status ct body
return (status_code, body, ct, hdrs, response) return (status_code, body, ct, hdrs, response)
disableStatusCheck :: Request -> Request
#if MIN_VERSION_http_client(0,5,0)
disableStatusCheck req = req { checkResponse = \ _req _res -> return () }
#else
disableStatusCheck req = req { checkStatus = \ _status _headers _cookies -> Nothing }
#endif
performRequestCT :: MimeUnrender ct result => performRequestCT :: MimeUnrender ct result =>
Proxy ct -> Method -> Req -> Manager -> BaseUrl Proxy ct -> Method -> Req -> Manager -> BaseUrl