@@ -38,7 +38,6 @@ import Network.Socket
38import qualified Network.Socket.ByteString as Sock
38import qualified Network.Socket.ByteString as Sock
39import Control.Exception (bracket, finally, Exception, SomeException, catch)
39import Control.Exception (bracket, finally, Exception, SomeException, catch)
40import Control.Concurrent (forkIO)
40import Control.Concurrent (forkIO)
41−import Control.Monad (unless, when)
42import Data.Maybe (fromMaybe)
41import Data.Maybe (fromMaybe)
44import Data.Typeable (Typeable)
43import Data.Typeable (Typeable)
@@ -88,7 +87,7 @@ serveConnection port app conn remoteHost' = do
88 (enumeratee, env) <- parseRequest port remoteHost'
87 (enumeratee, env) <- parseRequest port remoteHost'
89 res <- E.joinI $ enumeratee $$ app env
88 res <- E.joinI $ enumeratee $$ app env
90 keepAlive <- liftIO $ sendResponse env (httpVersion env) conn res
89 keepAlive <- liftIO $ sendResponse env (httpVersion env) conn res
91− when keepAlive serveConnection'
90+ if keepAlive then serveConnection' else return ()
93parseRequest :: Port -> SockAddr -> E.Iteratee S.ByteString IO (E.Enumeratee ByteString ByteString IO a, Request)
92parseRequest :: Port -> SockAddr -> E.Iteratee S.ByteString IO (E.Enumeratee ByteString ByteString IO a, Request)
94parseRequest port remoteHost' = do
93parseRequest port remoteHost' = do