018a38c · servant · git.iko.soy

git.iko.soy/servant

on master help sign in

Merge pull request #696 from edsko/pr/escape-capture

018a38cOleg Grenrus9 years ago

servant-client/src/Servant/Common/Req.hs+5−3

compare with master

unifiedsplit

@@ -27,6 +27,7 @@ import Control.Monad.Base (MonadBase (..))

27import Control.Monad.IO.Class ()

28import Control.Monad.Reader

29import Control.Monad.Trans.Control (MonadBaseControl (..))

30+import qualified Data.ByteString.Builder as BS

30import Data.ByteString.Lazy hiding (pack, filter, map, null, elem, any)

31import Data.ByteString.Lazy hiding (pack, filter, map, null, elem, any)

31import Data.String

32import Data.String

32import Data.String.Conversions (cs)

33import Data.String.Conversions (cs)

@@ -86,7 +87,7 @@ instance Eq ServantError where

86instance Exception ServantError

87instance Exception ServantError

88data Req = Req

89data Req = Req

89− { reqPath :: String

90+ { reqPath :: BS.Builder

90 , qs :: QueryText

91 , qs :: QueryText

91 , reqBody :: Maybe (RequestBody, MediaType)

92 , reqBody :: Maybe (RequestBody, MediaType)

92 , reqAccept :: [MediaType]

93 , reqAccept :: [MediaType]

@@ -98,7 +99,7 @@ defReq = Req "" [] Nothing [] []

99appendToPath :: String -> Req -> Req

100appendToPath :: String -> Req -> Req

100appendToPath p req =

101appendToPath p req =

101− req { reqPath = reqPath req ++ "/" ++ p }

102+ req { reqPath = reqPath req <> "/" <> toEncodedUrlPiece p }

102

103

103appendToQueryString :: Text -- ^ param name

104appendToQueryString :: Text -- ^ param name

104 -> Maybe Text -- ^ param value

105 -> Maybe Text -- ^ param value

@@ -151,8 +152,9 @@ reqToRequest req (BaseUrl reqScheme reqHost reqPort path) =

151 , uriRegName = reqHost

152 , uriRegName = reqHost

152 , uriPort = ":" ++ show reqPort

153 , uriPort = ":" ++ show reqPort

153 }

154 }

154− , uriPath = path ++ reqPath req

155+ , uriPath = fullPath

155 }

156 }

157+ fullPath = path ++ cs (BS.toLazyByteString (reqPath req))

156

158

157 setrqb r = case reqBody req of

159 setrqb r = case reqBody req of

158 Nothing -> r

160 Nothing -> r