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

Review fixes

Browse source
This commit is contained in:
Julian K. Arni 2016-09-02 10:25:22 -03:00
parent 4faaa0b674
commit 7755620e7a
2 changed files with 28 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -41,7 +41,7 @@ library
, base64-bytestring >= 1.0.0.1 && < 1.1 , base64-bytestring >= 1.0.0.1 && < 1.1
, 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.4 , http-api-data >= 0.3 && < 0.4
, http-client >= 0.4.18.1 && < 0.6 , http-client >= 0.4.18.1 && < 0.6
, http-client-tls >= 0.2.2 && < 0.4 , http-client-tls >= 0.2.2 && < 0.4
, http-media >= 0.6.2 && < 0.7 , http-media >= 0.6.2 && < 0.7

30
servant-server/src/Servant/Server/Internal.hs
View file

@ -36,36 +36,26 @@ import Network.HTTP.Types hiding (Header, ResponseHeaders)
import Network.Socket (SockAddr) import Network.Socket (SockAddr)
import Network.Wai (Application, Request, Response, import Network.Wai (Application, Request, Response,
httpVersion, isSecure, httpVersion, isSecure,
lazyRequestBody, lazyRequestBody, rawQueryString,
rawQueryString, remoteHost, remoteHost, requestHeaders,
requestHeaders, requestMethod, requestMethod, responseLBS, vault)
responseLBS, vault)
import Prelude () import Prelude ()
import Prelude.Compat import Prelude.Compat
import Web.HttpApiData (FromHttpApiData) import Web.HttpApiData (FromHttpApiData, parseHeaderMaybe,
#if MIN_VERSION_http_api_data(0,3,0)
import Web.Internal.HttpApiData (parseHeaderMaybe,
parseQueryParamMaybe, parseQueryParamMaybe,
parseUrlPieceMaybe, parseUrlPieceMaybe,
parseUrlPieces) parseUrlPieces)
#else
import Web.HttpApiData.Internal (parseHeaderMaybe,
parseQueryParamMaybe,
parseUrlPieceMaybe,
parseUrlPieces)
#endif
import Servant.API ((:<|>) (..), (:>), BasicAuth, Capture, import Servant.API ((:<|>) (..), (:>), BasicAuth,
CaptureAll, Verb, Capture, CaptureAll, Header,
ReflectMethod(reflectMethod), IsSecure (..), QueryFlag,
IsSecure(..), Header, QueryFlag,
QueryParam, QueryParams, Raw, QueryParam, QueryParams, Raw,
RemoteHost, ReqBody, Vault, ReflectMethod (reflectMethod),
RemoteHost, ReqBody, Vault, Verb,
WithNamedContext) WithNamedContext)
import Servant.API.ContentTypes (AcceptHeader (..), import Servant.API.ContentTypes (AcceptHeader (..),
AllCTRender (..), AllCTRender (..),
AllCTUnrender (..), AllCTUnrender (..), AllMime,
AllMime,
canHandleAcceptH) canHandleAcceptH)
import Servant.API.ResponseHeaders (GetHeaders, Headers, getHeaders, import Servant.API.ResponseHeaders (GetHeaders, Headers, getHeaders,
getResponse) getResponse)