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 36461695e3319c84a9db39faf2b265dc9ce564ec (commit)
via 37a9723cd65349cc6d01094f68740697100313ec (commit)
from 32ebd331bd449883f62ac56afd28b8fcc14c58eb (commit)
Summary of changes:
snap-server.cabal | 7 +++++--
src/Snap/Internal/Http/Server/LibevBackend.hs | 10 ++++------
2 files changed, 9 insertions(+), 8 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 36461695e3319c84a9db39faf2b265dc9ce564ec
Author: Gregory Collins <[email protected]>
Date: Sat Jul 3 02:01:18 2010 -0400
Expose all the files in the sdist
diff --git a/snap-server.cabal b/snap-server.cabal
index 423362d..4b12646 100644
--- a/snap-server.cabal
+++ b/snap-server.cabal
@@ -55,6 +55,8 @@ extra-source-files:
LICENSE,
README.md,
README.SNAP.md,
+ test/benchmark/Benchmark.hs,
+ test/benchmark/Snap/Internal/Http/Parser/Benchmark.hs,
test/data/fileServe/foo.bin,
test/data/fileServe/foo.bin.bin.bin,
test/data/fileServe/foo.html,
@@ -92,7 +94,8 @@ Library
Paths_snap_server,
Snap.Internal.Http.Parser,
Snap.Internal.Http.Server,
- Snap.Internal.Http.Server.Date
+ Snap.Internal.Http.Server.Date,
+ System.SendFile
build-depends:
array >= 0.2 && <0.4,
commit 37a9723cd65349cc6d01094f68740697100313ec
Author: Gregory Collins <[email protected]>
Date: Sat Jul 3 01:59:56 2010 -0400
Don't take the loop lock in the timeout handler! (stupid!!)
diff --git a/snap-server.cabal b/snap-server.cabal
index d730ab9..423362d 100644
--- a/snap-server.cabal
+++ b/snap-server.cabal
@@ -1,5 +1,5 @@
name: snap-server
-version: 0.2.7
+version: 0.2.7.1
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
diff --git a/src/Snap/Internal/Http/Server/LibevBackend.hs
b/src/Snap/Internal/Http/Server/LibevBackend.hs
index 6632b55..9bd3b0d 100644
--- a/src/Snap/Internal/Http/Server/LibevBackend.hs
+++ b/src/Snap/Internal/Http/Server/LibevBackend.hs
@@ -376,13 +376,12 @@ getAddr addr =
-- | throw a timeout exception to the handling thread -- it'll clean up
-- everything
-timerCallback :: MVar () -- ^ loop lock
- -> EvLoopPtr -- ^ loop obj
+timerCallback :: EvLoopPtr -- ^ loop obj
-> EvTimerPtr -- ^ timer obj
-> IORef CTime -- ^ when to timeout?
-> MVar ThreadId -- ^ thread to kill
-> TimerCallback
-timerCallback lock loop tmr ioref tmv _ _ _ = do
+timerCallback loop tmr ioref tmv _ _ _ = do
debug "Backend.timerCallback: entered"
now <- getCurrentDateTime
@@ -394,7 +393,7 @@ timerCallback lock loop tmr ioref tmv _ _ _ = do
tid <- readMVar tmv
throwTo tid TimeoutException
- else withMVar lock $ \_ -> do -- re-arm the timer
+ else do -- re-arm the timer
-- fixme: should set repeat here, have to wait for an hlibev patch to
-- do it
evTimerAgain loop tmr
@@ -570,8 +569,7 @@ withConnection backend cpu proc = go
thrmv <- newEmptyMVar
now <- getCurrentDateTime
timeoutTime <- newIORef $ now + 20
- tcb <- mkTimerCallback $ timerCallback (_loopLock backend)
- lp
+ tcb <- mkTimerCallback $ timerCallback lp
tmr
timeoutTime
thrmv
-----------------------------------------------------------------------
hooks/post-receive
--
snap-server
_______________________________________________
Snap mailing list
[email protected]
http://mailman-mail5.webfaction.com/listinfo/snap
