git.iko.soy/typeable/servant
on master help sign in
CPP deprecated parseUrl function.
023368cJulian K. Arni
servant-client/src/Servant/Common/Req.hs+4−1
@@ -103,7 +103,7 @@ setRQBody b t req = req { reqBody = Just (b, t) }
103
103
104reqToRequest :: (Functor m, MonadThrow m) => Req -> BaseUrl -> m Request
104reqToRequest :: (Functor m, MonadThrow m) => Req -> BaseUrl -> m Request
105reqToRequest req (BaseUrl reqScheme reqHost reqPort path) =
105reqToRequest req (BaseUrl reqScheme reqHost reqPort path) =
106− setheaders . setAccept . setrqb . setQS <$> parseUrl url
106+ setheaders . setAccept . setrqb . setQS <$> parseUrlThrow url
107
107
108 where url = show $ nullURI { uriScheme = case reqScheme of
108 where url = show $ nullURI { uriScheme = case reqScheme of
109 Http -> "http:"
109 Http -> "http:"
@@ -129,6 +129,9 @@ reqToRequest req (BaseUrl reqScheme reqHost reqPort path) =
129 | not . null . reqAccept $ req] }
129 | not . null . reqAccept $ req] }
130 toProperHeader (name, val) =
130 toProperHeader (name, val) =
131 (fromString name, encodeUtf8 val)
131 (fromString name, encodeUtf8 val)
132+#if !MIN_VERSION_http_client(0,4,30)
133+ parseUrlThrow = parseUrl
134+#endif
132
135
133
136
134-- * performing requests
137-- * performing requests