git.iko.soy/typeable/wai
on master help sign in
WAI 2.0 fixes
commit16403e8cbfa57b210aa470f59a7574d0545da004 authorMichael Snoyman <michael@snoyman.com> dateSun 10 Nov 2013, 16:43 (13 years ago) parent8318c3b
2 files changed+2−18
compare with master
unifiedsplit
wai-test/Network/Wai/Test.hs−16 warp-tls/Network/Wai/Handler/WarpTLS.hs+2−2
wai-test/Network/Wai/Test.hs−16
@@ -71,22 +71,6 @@ data SResponse = SResponse
7171request :: Request -> Session SResponse
7272request = srequest . flip SRequest L.empty
7373
74−defaultRequest :: Request
75−defaultRequest = Request
76− { requestMethod = "GET"
77− , httpVersion = H.http11
78− , rawPathInfo = "/"
79− , rawQueryString = ""
80− , requestHeaders = []
81− , isSecure = False
82− , remoteHost = SockAddrInet 0 0
83− , pathInfo = []
84− , queryString = []
85− , requestBody = mempty
86− , vault = mempty
87− , requestBodyLength = KnownLength 0
88− }
89−
9074-- | Set whole path (request path + query string).
9175setPath :: Request -> S8.ByteString -> Request
9276setPath req path = req {
warp-tls/Network/Wai/Handler/WarpTLS.hs+2−2
@@ -43,7 +43,6 @@ import qualified Data.PEM as PEM
4343import Data.Conduit.Network (sourceSocket, sinkSocket, acceptSafe)
4444import Data.Maybe (fromMaybe)
4545import qualified Data.IORef as I
46−import Crypto.Random.AESCtr (makeSystem)
4746import Control.Exception (Exception, throwIO)
4847import Data.Typeable (Typeable)
4948import qualified Data.Conduit.Binary as CB
@@ -139,13 +138,14 @@ runTLSSocket TLSSettings {..} set sock app = do
139138 let conn = Connection
140139 { connSendMany = TLS.sendData ctx . L.fromChunks
141140 , connSendAll = TLS.sendData ctx . L.fromChunks . return
142− , connSendFile = \fp offset len _th headers _cleaner -> do
141+ , connSendFile = \fp offset len _th headers -> do
143142 TLS.sendData ctx $ L.fromChunks headers
144143 C.runResourceT $ sourceFileRange fp (Just offset) (Just len) C.$$ CL.mapM_ (TLS.sendData ctx . L.fromChunks . return)
145144 , connClose =
146145 TLS.bye ctx `finally`
147146 TLS.contextClose ctx
148147 , connRecv = TLS.recvData ctx
148+ , connSendFileOverride = NotOverride
149149 }
150150 return conn
151151 else