@@ -278,7 +278,7 @@ serveConnection conn ii origAddr isSecure' settings app = do
278 istatus <- newIORef False
278 istatus <- newIORef False
279 src <- mkSource (connSource conn th istatus)
279 src <- mkSource (connSource conn th istatus)
280 addr <- getProxyProtocolAddr src
280 addr <- getProxyProtocolAddr src
281− recvSendLoop addr istatus src `E.catch` \e -> do
281+ http1 addr istatus src `E.catch` \e -> do
282 sendErrorResponse addr istatus e
282 sendErrorResponse addr istatus e
283 throwIO (e :: SomeException)
283 throwIO (e :: SomeException)
@@ -336,19 +336,19 @@ serveConnection conn ii origAddr isSecure' settings app = do
337 errorResponse e = settingsOnExceptionResponse settings e
337 errorResponse e = settingsOnExceptionResponse settings e
339− recvSendLoop addr istatus fromClient = do
339+ http1 addr istatus src = do
340− (req', mremainingRef, idxhdr) <- recvRequest settings conn ii addr fromClient
340+ (req', mremainingRef, idxhdr) <- recvRequest settings conn ii addr src
341 let req = req' { isSecure = isSecure' }
341 let req = req' { isSecure = isSecure' }
342− keepAlive <- processRequest istatus fromClient req mremainingRef idxhdr
342+ keepAlive <- processRequest istatus src req mremainingRef idxhdr
343 `E.catch` \e -> do
343 `E.catch` \e -> do
344 -- Call the user-supplied exception handlers, passing the request.
344 -- Call the user-supplied exception handlers, passing the request.
345 sendErrorResponse addr istatus e
345 sendErrorResponse addr istatus e
346 onE settings (Just req) e
346 onE settings (Just req) e
347 -- Don't throw the error again to prevent calling onE twice.
347 -- Don't throw the error again to prevent calling onE twice.
348 return False
348 return False
349− when keepAlive $ recvSendLoop addr istatus fromClient
349+ when keepAlive $ http1 addr istatus src
351− processRequest istatus fromClient req mremainingRef idxhdr = do
351+ processRequest istatus src req mremainingRef idxhdr = do
352 -- Let the application run for as long as it wants
352 -- Let the application run for as long as it wants
353 T.pause th
353 T.pause th
@@ -364,7 +364,7 @@ serveConnection conn ii origAddr isSecure' settings app = do
364 writeIORef istatus False
364 writeIORef istatus False
365 keepAlive <- sendResponse
365 keepAlive <- sendResponse
366 (settingsServerName settings)
366 (settingsServerName settings)
367− conn ii req idxhdr (readSource fromClient) res
367+ conn ii req idxhdr (readSource src) res
368 writeIORef keepAliveRef keepAlive
368 writeIORef keepAliveRef keepAlive
369 return ResponseReceived
369 return ResponseReceived
370 keepAlive <- readIORef keepAliveRef
370 keepAlive <- readIORef keepAliveRef