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 987b888ffd74a79327080734e58171f3c0528f71 (commit)
via 6dafc8f8ec268ad4a6ad8008061bfbc62e0e6316 (commit)
from 24d7ab6ba3e1132b38c50a14fda652ed7c47a2d6 (commit)
Summary of changes:
snap-server.cabal | 2 +-
src/Snap/Internal/Http/Parser.hs | 2 +-
src/Snap/Internal/Http/Server.hs | 6 +++---
3 files changed, 5 insertions(+), 5 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 987b888ffd74a79327080734e58171f3c0528f71
Author: Gregory Collins <[email protected]>
Date: Sun May 30 14:32:10 2010 -0400
Add an 'escape valve' to safe buffer iteratee
diff --git a/src/Snap/Internal/Http/Parser.hs b/src/Snap/Internal/Http/Parser.hs
index 055cf64..fee9af6 100644
--- a/src/Snap/Internal/Http/Parser.hs
+++ b/src/Snap/Internal/Http/Parser.hs
@@ -116,7 +116,7 @@ writeChunkedTransferEncoding :: ForeignPtr CChar
writeChunkedTransferEncoding _buf enum it = do
i' <- wrap it
--(i,_) <- unsafeBufferIterateeWithBuffer buf i'
- i <- bufferIteratee i'
+ (i,_) <- bufferIteratee i'
enum i
where
diff --git a/src/Snap/Internal/Http/Server.hs b/src/Snap/Internal/Http/Server.hs
index f41f826..3cd9e4d 100644
--- a/src/Snap/Internal/Http/Server.hs
+++ b/src/Snap/Internal/Http/Server.hs
@@ -306,10 +306,10 @@ httpSession writeEnd' ibuf onSendFile tickle handler = do
-- (writeEnd, cancelBuffering) <-
-- liftIO $ I.unsafeBufferIterateeWithBuffer ibuf writeEnd'
- -- let killBuffer = writeIORef cancelBuffering True
- writeEnd <- liftIO $ I.bufferIteratee writeEnd'
- let killBuffer = return ()
+ (writeEnd, cancelBuffering) <- liftIO $ I.bufferIteratee writeEnd'
+ let killBuffer = writeIORef cancelBuffering True
+
liftIO $ debug "Server.httpSession: entered"
mreq <- receiveRequest
commit 6dafc8f8ec268ad4a6ad8008061bfbc62e0e6316
Author: Gregory Collins <[email protected]>
Date: Sun May 30 13:41:29 2010 -0400
Bump version number
diff --git a/snap-server.cabal b/snap-server.cabal
index 60a1451..ed3708a 100644
--- a/snap-server.cabal
+++ b/snap-server.cabal
@@ -1,5 +1,5 @@
name: snap-server
-version: 0.2.5
+version: 0.2.6
synopsis: A fast, iteratee-based, epoll-enabled web server for the Snap
Framework
description:
This is the first developer prerelease of the Snap framework. Snap is a
-----------------------------------------------------------------------
hooks/post-receive
--
snap-server
_______________________________________________
Snap mailing list
[email protected]
http://mailman-mail5.webfaction.com/listinfo/snap
