c3eafc2 · typeable/wai

git.iko.soy/typeable/wai

Fix a broken external API

commitc3eafc2385d8130150b48f7edf364c6614c2717e authorMichael Snoyman <michael@snoyman.com> dateThu 20 Jun 2013, 22:21 (13 years ago) parentcd82d85

3 files changed+10−3

unifiedsplit

warp/Network/Wai/Handler/Warp/Request.hs+8−1

@@ -32,11 +32,18 @@ maxTotalHeaderLength :: Int

3232maxTotalHeaderLength = 50 * 1024

3333

3434parseRequest :: 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

3542 -> Timeout.Handle

3643 -> Port -> SockAddr

3744 -> Source (ResourceT IO) ByteString

3845 -> ResourceT IO (Request, IO (ResumableSource (ResourceT IO) ByteString))

39−parseRequest conn timeoutHandle port remoteHost' src1 = do

46+parseRequestInternal conn timeoutHandle port remoteHost' src1 = do

4047 (src2, headers') <- src1 $$+ takeHeaders

4148 parseRequest' conn timeoutHandle port headers' remoteHost' src2

4249

warp/Network/Wai/Handler/Warp/Run.hs+1−1

@@ -244,7 +244,7 @@ serveConnection timeoutHandle settings cleaner port app conn remoteHost' =

244244 serveConnection' = serveConnection'' $ connSource conn th

245245

246246 serveConnection'' fromClient = do

247− (env, getSource) <- parseRequest conn timeoutHandle port remoteHost' fromClient

247+ (env, getSource) <- parseRequestInternal conn timeoutHandle port remoteHost' fromClient

248248 case settingsIntercept settings env of

249249 Nothing -> do

250250 -- Let the application run for as long as it wants

warp/warp.cabal+1−1

@@ -1,5 +1,5 @@

11Name: warp

2−Version: 1.3.8.3

2+Version: 1.3.8.4

33Synopsis: A fast, light-weight web server for WAI applications.

44License: MIT

55License-file: LICENSE