on master help sign in
Fix a broken external API
c3eafc2Michael Snoyman
warp/Network/Wai/Handler/Warp/Request.hs+8−1
@@ -32,11 +32,18 @@ maxTotalHeaderLength :: Int
32maxTotalHeaderLength = 50 * 1024
32maxTotalHeaderLength = 50 * 1024
33
33
34parseRequest :: Connection
34parseRequest :: Connection
35+ -> Port -> SockAddr
36+ -> Source (ResourceT IO) ByteString
37+ -> ResourceT IO (Request, IO (ResumableSource (ResourceT IO) ByteString))
38+parseRequest conn = parseRequestInternal conn Timeout.dummyHandle
39+
40+parseRequestInternal
41+ :: Connection
35 -> Timeout.Handle
42 -> Timeout.Handle
36 -> Port -> SockAddr
43 -> Port -> SockAddr
37 -> Source (ResourceT IO) ByteString
44 -> Source (ResourceT IO) ByteString
38 -> ResourceT IO (Request, IO (ResumableSource (ResourceT IO) ByteString))
45 -> ResourceT IO (Request, IO (ResumableSource (ResourceT IO) ByteString))
39−parseRequest conn timeoutHandle port remoteHost' src1 = do
46+parseRequestInternal conn timeoutHandle port remoteHost' src1 = do
40 (src2, headers') <- src1 $$+ takeHeaders
47 (src2, headers') <- src1 $$+ takeHeaders
41 parseRequest' conn timeoutHandle port headers' remoteHost' src2
48 parseRequest' conn timeoutHandle port headers' remoteHost' src2
42
49
warp/Network/Wai/Handler/Warp/Run.hs+1−1
@@ -244,7 +244,7 @@ serveConnection timeoutHandle settings cleaner port app conn remoteHost' =
244 serveConnection' = serveConnection'' $ connSource conn th
244 serveConnection' = serveConnection'' $ connSource conn th
245
245
246 serveConnection'' fromClient = do
246 serveConnection'' fromClient = do
247− (env, getSource) <- parseRequest conn timeoutHandle port remoteHost' fromClient
247+ (env, getSource) <- parseRequestInternal conn timeoutHandle port remoteHost' fromClient
248 case settingsIntercept settings env of
248 case settingsIntercept settings env of
249 Nothing -> do
249 Nothing -> do
250 -- Let the application run for as long as it wants
250 -- Let the application run for as long as it wants
warp/warp.cabal+1−1
@@ -1,5 +1,5 @@
1Name: warp
1Name: warp
2−Version: 1.3.8.3
2+Version: 1.3.8.4
3Synopsis: A fast, light-weight web server for WAI applications.
3Synopsis: A fast, light-weight web server for WAI applications.
4License: MIT
4License: MIT
5License-file: LICENSE
5License-file: LICENSE