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-core".
The branch, master has been updated
via dbc512dc97a726b772c4a31f84b3087721735961 (commit)
via 3237c81677e03284a2bebb6aa90b0c92f704568f (commit)
from 842b09db3cdfcf3116e214c472e664a0aee529a6 (commit)
Summary of changes:
README.SNAP.md | 2 +-
snap-core.cabal | 7 +++----
src/Snap/Iteratee.hs | 7 +------
3 files changed, 5 insertions(+), 11 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 dbc512dc97a726b772c4a31f84b3087721735961
Author: Gregory Collins <[email protected]>
Date: Fri Apr 29 14:40:02 2011 +0200
Update snap self-description
diff --git a/README.SNAP.md b/README.SNAP.md
index 139cd0e..daa1d1b 100644
--- a/README.SNAP.md
+++ b/README.SNAP.md
@@ -9,7 +9,7 @@ the Snap project website at http://snapframework.com/.
Snap Status and Features
------------------------
-This developer prerelease contains only the Snap core system, namely:
+The Snap core system consists of:
* a high-speed HTTP server, with an optional high-concurrency backend using
the [libev](http://software.schmorp.de/pkg/libev.html) library
diff --git a/snap-core.cabal b/snap-core.cabal
index d156740..ee12126 100644
--- a/snap-core.cabal
+++ b/snap-core.cabal
@@ -3,10 +3,9 @@ version: 0.4.2
synopsis: Snap: A Haskell Web Framework (Core)
description:
- This is the first developer prerelease of the Snap framework. Snap is a
- simple and fast web development framework and server written in Haskell. For
- more information or to download the latest version, you can visit the Snap
- project website at <http://snapframework.com/>.
+ Snap is a simple and fast web development framework and server written in
+ Haskell. For more information or to download the latest version, you can
+ visit the Snap project website at <http://snapframework.com/>.
.
This library contains the core definitions and types for the Snap framework,
including:
commit 3237c81677e03284a2bebb6aa90b0c92f704568f
Author: Gregory Collins <[email protected]>
Date: Mon Apr 4 19:17:00 2011 +0200
Fix MonadCatchIO instance for Iteratee (again) -- was gobbling unconsumed
input when it didn't have to.
diff --git a/src/Snap/Iteratee.hs b/src/Snap/Iteratee.hs
index 89b7148..283338d 100644
--- a/src/Snap/Iteratee.hs
+++ b/src/Snap/Iteratee.hs
@@ -129,7 +129,6 @@ import System.PosixCompat.Files
import System.PosixCompat.Types
#endif
-
------------------------------------------------------------------------------
instance (Functor m, MonadCatchIO m) =>
MonadCatchIO (Iteratee s m) where
@@ -139,11 +138,7 @@ instance (Functor m, MonadCatchIO m) =>
insideCatch !mm = Iteratee $ do
ee <- try $ runIteratee mm
case ee of
- -- if we got an async exception here then the iteratee
workflow is
- -- all messed up, we have no reasonable choice but to send EOF
to the
- -- handler, because the unparsed input got lost. If the
enumerator
- -- sends more chunks we can possibly recover later.
- (Left e) -> runIteratee (enumEOF $$ handler e)
+ (Left e) -> runIteratee $ handler e
(Right v) -> step v
step (Continue !k) = do
-----------------------------------------------------------------------
hooks/post-receive
--
snap-core
_______________________________________________
Snap mailing list
[email protected]
http://mailman-mail5.webfaction.com/listinfo/snap
