Permalink
Browse files

Merge branch 'master' into 0.8

  • Loading branch information...
2 parents 8acd289 + 35d7a07 commit 1a839446fe0640e9507a83205a373b86ec0b4b99 @gregorycollins gregorycollins committed Mar 9, 2012
Showing with 2 additions and 3 deletions.
  1. +2 −3 src/Snap/Internal/Http/Server/SimpleBackend.hs
@@ -121,7 +121,7 @@ acceptThread defaultTimeout handler tmgr elog cpu sock exitMVar =
go = runSession defaultTimeout handler tmgr sock
- acceptHandler =
+ acceptHandler =
[ Handler $ \(e :: AsyncException) -> throwIO e
, Handler $ \(e :: SomeException) -> do
elog $ S.concat [ "SimpleBackend.acceptThread: accept threw: "
@@ -161,7 +161,6 @@ runSession defaultTimeout handler tmgr lsock sock addr = do
let sinfo = SessionInfo lhost lport rhost rport $ Listen.isSecure lsock
timeoutHandle <- TM.register (killThread curId) tmgr
- let setTimeout = TM.set timeoutHandle
let tickleTimeout = TM.tickle timeoutHandle
bracket (Listen.createSession lsock 8192 fd
@@ -183,7 +182,7 @@ runSession defaultTimeout handler tmgr lsock sock addr = do
writeEnd
(sendFile lsock (tickleTimeout defaultTimeout)
fd writeEnd)
- setTimeout
+ tickleTimeout
)

0 comments on commit 1a83944

Please sign in to comment.