Merge branch 'fix-231'
Conflicts:
warp/warp.cabal
commitb9d1c4367990745ffa204a6ce393bfe255bc418d
authorMichael Snoyman <michael@snoyman.com>
dateThu 6 Mar 2014, 07:07 (13 years ago)
parent4e6188c322515d
warp/Network/Wai/Handler/Warp/Run.hs+1
@@ -270,6 +270,7 @@ serveConnection conn ii addr settings app = do
270270 requestBody req $$ CL.sinkNull
271271 ResumableSource fromClient' _ <- getSource
272272
273+ T.resume th
273274 when keepAlive $ recvSendLoop istatus fromClient'
274275 Just intercept -> do
275276 T.pause th