This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "snap-server".
The branch, master has been updated
via 3e30900a3c5818ebf9dced2d79c7a85880ef5f77 (commit)
from da140b2035d4bdfab7dcb479ddba449ca13db26a (commit)
Summary of changes:
src/Snap/Internal/Http/Server/SimpleBackend.hs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3e30900a3c5818ebf9dced2d79c7a85880ef5f77
Author: Gregory Collins <[email protected]>
Date: Sun Jun 12 17:09:57 2011 -0400
Oops: wait on the socket FD, not the file FD
diff --git a/src/Snap/Internal/Http/Server/SimpleBackend.hs
b/src/Snap/Internal/Http/Server/SimpleBackend.hs
index fdaf87d..78369db 100644
--- a/src/Snap/Internal/Http/Server/SimpleBackend.hs
+++ b/src/Snap/Internal/Http/Server/SimpleBackend.hs
@@ -220,7 +220,7 @@ sendFile lsock tickle sock writeEnd fp start sz =
go off bytes fd
| bytes == 0 = return ()
| otherwise = do
- sent <- SF.sendFile (threadWaitWrite $ fromIntegral fd)
+ sent <- SF.sendFile (threadWaitWrite $ fromIntegral sock)
sfd fd off bytes
if sent < bytes
then tickle >> go (off+sent) (bytes-sent) fd
-----------------------------------------------------------------------
hooks/post-receive
--
snap-server
_______________________________________________
Snap mailing list
[email protected]
https://mailman-mail5.webfaction.com/listinfo/snap
