@@ -308,7 +308,7 @@ parseRequest' conn port (firstLine:otherLines) remoteHost' src = do
308 -- We can't use the standard isolate, as its counter is not
308 -- We can't use the standard isolate, as its counter is not
309 -- kept in a mutable variable.
309 -- kept in a mutable variable.
310 lenRef <- liftIO $ I.newIORef len0
310 lenRef <- liftIO $ I.newIORef len0
311− let isolate = C.Running push C.Closed
311+ let isolate = C.NeedInput push C.Closed
312 push bs = flip C.ConduitM (return ()) $ do
312 push bs = flip C.ConduitM (return ()) $ do
313 len <- liftIO $ I.readIORef lenRef
313 len <- liftIO $ I.readIORef lenRef
314 let (a, b) = S.splitAt len bs
314 let (a, b) = S.splitAt len bs
@@ -320,8 +320,8 @@ parseRequest' conn port (firstLine:otherLines) remoteHost' src = do
320 final = C.Finished mleftover
320 final = C.Finished mleftover
321 in if S.null a
321 in if S.null a
322 then final
322 then final
323− else C.HaveMore final (return ()) a
323+ else C.HaveOutput final (return ()) a
324− else C.HaveMore isolate (return ()) a
324+ else C.HaveOutput isolate (return ()) a
326 -- Make sure that we don't connect to the source after the
326 -- Make sure that we don't connect to the source after the
327 -- isolate conduit closes.
327 -- isolate conduit closes.
@@ -531,8 +531,8 @@ sendResponse th req conn r = sendResponse' r
531 -- functions below. Should lessen greatly the GC burden (I hope)
531 -- functions below. Should lessen greatly the GC burden (I hope)
532 needsChunked' = needsChunked hs
532 needsChunked' = needsChunked hs
533 chunk :: C.Conduit Builder (ResourceT IO) Builder
533 chunk :: C.Conduit Builder (ResourceT IO) Builder
534− chunk = C.Running push close
534+ chunk = C.NeedInput push close
535− push x = C.HaveMore chunk (return ()) (chunkedTransferEncoding x)
535+ push x = C.HaveOutput chunk (return ()) (chunkedTransferEncoding x)
536 close = C.Open C.Closed (return ()) chunkedTransferTerminator
536 close = C.Open C.Closed (return ()) chunkedTransferTerminator
538parseHeaderNoAttr :: ByteString -> H.Header
538parseHeaderNoAttr :: ByteString -> H.Header