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 344aca6b7e18dc4f32acae324029ea22f3ddf8e9 (commit)
from b6689175ea5a8944b47650ee113047f62f4c7989 (commit)
Summary of changes:
snap-server.cabal | 2 +-
test/snap-server-testsuite.cabal | 6 +++---
test/suite/Test/Blackbox.hs | 11 +++++------
3 files changed, 9 insertions(+), 10 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 344aca6b7e18dc4f32acae324029ea22f3ddf8e9
Author: Gregory Collins <[email protected]>
Date: Sat Dec 11 17:01:15 2010 +0100
Try to prevent exceptions from leaking out of the blackbox servers
diff --git a/snap-server.cabal b/snap-server.cabal
index 2858845..aae27e8 100644
--- a/snap-server.cabal
+++ b/snap-server.cabal
@@ -142,7 +142,7 @@ Library
utf8-string,
unix-compat == 0.2.*,
vector >= 0.7 && <0.8,
- vector-algorithms >= 0.3.4 && <0.4,
+ vector-algorithms >= 0.4 && <0.5,
PSQueue >= 1.1 && <1.2
if flag(portable) || os(windows)
diff --git a/test/snap-server-testsuite.cabal b/test/snap-server-testsuite.cabal
index 909d97d..ccb4c52 100644
--- a/test/snap-server-testsuite.cabal
+++ b/test/snap-server-testsuite.cabal
@@ -55,7 +55,7 @@ Executable testsuite
transformers,
utf8-string >= 0.3.6 && <0.4,
vector >= 0.7 && <0.8,
- vector-algorithms >= 0.3.4 && <0.4,
+ vector-algorithms >= 0.4 && <0.5,
PSQueue >= 1.1 && <1.2
if !os(windows)
@@ -113,7 +113,7 @@ Executable pongserver
unix-compat == 0.2.*,
utf8-string >= 0.3.6 && <0.4,
vector >= 0.7 && <0.8,
- vector-algorithms >= 0.3.4 && <0.4,
+ vector-algorithms >= 0.4 && <0.5,
PSQueue >= 1.1 && <1.2
if flag(portable) || os(windows)
@@ -194,7 +194,7 @@ Executable testserver
transformers,
utf8-string >= 0.3.6 && <0.4,
vector >= 0.7 && <0.8,
- vector-algorithms >= 0.3.4 && <0.4,
+ vector-algorithms >= 0.4 && <0.5,
PSQueue >= 1.1 && <1.2
if !os(windows)
diff --git a/test/suite/Test/Blackbox.hs b/test/suite/Test/Blackbox.hs
index 5d7d8bd..d1762eb 100644
--- a/test/suite/Test/Blackbox.hs
+++ b/test/suite/Test/Blackbox.hs
@@ -11,7 +11,7 @@ module Test.Blackbox
------------------------------------------------------------------------------
import Control.Concurrent
-import Control.Exception (finally)
+import Control.Exception (SomeException, catch)
import Control.Monad
import qualified Data.ByteString.Char8 as S
import Data.Int
@@ -19,7 +19,7 @@ import Data.Maybe (fromJust)
import qualified Network.HTTP as HTTP
import qualified Network.URI as URI
import qualified Network.Socket.ByteString as N
-import Prelude hiding (take)
+import Prelude hiding (catch, take)
import System.Directory (getCurrentDirectory)
import System.Timeout
import System.Posix.Signals (signalProcess, sigINT)
@@ -82,14 +82,13 @@ startTestServer port sslport backend = do
cfg
mvar <- newEmptyMVar
- tid <- forkIO $
- (httpServe cfg' testHandler
- `finally` putMVar mvar ())
+ tid <- forkIO $ do
+ (httpServe cfg' testHandler) `catch` \(e::SomeException) ->
return ()
+ putMVar mvar ()
waitabit
return (tid,mvar)
-
------------------------------------------------------------------------------
{- stunnel needs the SIGINT signal to properly shutdown, but
System.Process can currently only send SIGKILL. A future
-----------------------------------------------------------------------
hooks/post-receive
--
snap-server
_______________________________________________
Snap mailing list
[email protected]
http://mailman-mail5.webfaction.com/listinfo/snap
