@@ -278,7 +278,7 @@ serveConnection conn ii origAddr isSecure' settings app = do
278278 istatus <- newIORef False
279279 src <- mkSource (connSource conn th istatus)
280280 addr <- getProxyProtocolAddr src
281− recvSendLoop addr istatus src `E.catch` \e -> do
281+ http1 addr istatus src `E.catch` \e -> do
282282 sendErrorResponse addr istatus e
283283 throwIO (e :: SomeException)
284284
@@ -336,19 +336,19 @@ serveConnection conn ii origAddr isSecure' settings app = do
336336
337337 errorResponse e = settingsOnExceptionResponse settings e
338338
339− recvSendLoop addr istatus fromClient = do
340− (req', mremainingRef, idxhdr) <- recvRequest settings conn ii addr fromClient
339+ http1 addr istatus src = do
340+ (req', mremainingRef, idxhdr) <- recvRequest settings conn ii addr src
341341 let req = req' { isSecure = isSecure' }
342− keepAlive <- processRequest istatus fromClient req mremainingRef idxhdr
342+ keepAlive <- processRequest istatus src req mremainingRef idxhdr
343343 `E.catch` \e -> do
344344 -- Call the user-supplied exception handlers, passing the request.
345345 sendErrorResponse addr istatus e
346346 onE settings (Just req) e
347347 -- Don't throw the error again to prevent calling onE twice.
348348 return False
349− when keepAlive $ recvSendLoop addr istatus fromClient
349+ when keepAlive $ http1 addr istatus src
350350
351− processRequest istatus fromClient req mremainingRef idxhdr = do
351+ processRequest istatus src req mremainingRef idxhdr = do
352352 -- Let the application run for as long as it wants
353353 T.pause th
354354
@@ -364,7 +364,7 @@ serveConnection conn ii origAddr isSecure' settings app = do
364364 writeIORef istatus False
365365 keepAlive <- sendResponse
366366 (settingsServerName settings)
367− conn ii req idxhdr (readSource fromClient) res
367+ conn ii req idxhdr (readSource src) res
368368 writeIORef keepAliveRef keepAlive
369369 return ResponseReceived
370370 keepAlive <- readIORef keepAliveRef