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 9cd871e4ffcb137c6fff863057234175df41627e (commit)
from 2b9c9ec1a5b000654ff1d2dec7b6cc881c8ddd52 (commit)
Summary of changes:
src/Snap/Internal/Http/Types.hs | 6 +-----
src/Snap/Internal/Types.hs | 7 +------
2 files changed, 2 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 9cd871e4ffcb137c6fff863057234175df41627e
Author: Gregory Collins <[email protected]>
Date: Thu Sep 9 19:21:41 2010 -0400
Revert "Add a field to Response so we can tell whether we detached the
request body enumerator or not"
This reverts commit 2b9c9ec1a5b000654ff1d2dec7b6cc881c8ddd52.
diff --git a/src/Snap/Internal/Http/Types.hs b/src/Snap/Internal/Http/Types.hs
index ad8a22a..f766230 100644
--- a/src/Snap/Internal/Http/Types.hs
+++ b/src/Snap/Internal/Http/Types.hs
@@ -379,9 +379,6 @@ data Response = Response
-- | Returns the HTTP status explanation string.
, rspStatusReason :: !ByteString
-
- -- | If true, we detached the request body with 'unsafeDetachRequestBody'
- , rspDetachedBody :: !Bool
}
@@ -451,8 +448,7 @@ rqSetParam k v = rqModifyParams $ Map.insert k v
-- | An empty 'Response'.
emptyResponse :: Response
-emptyResponse = Response Map.empty (1,1) Nothing (Enum return) 200
- "OK" False
+emptyResponse = Response Map.empty (1,1) Nothing (Enum return) 200 "OK"
------------------------------------------------------------------------------
diff --git a/src/Snap/Internal/Types.hs b/src/Snap/Internal/Types.hs
index 6e11b22..4c21092 100644
--- a/src/Snap/Internal/Types.hs
+++ b/src/Snap/Internal/Types.hs
@@ -27,7 +27,6 @@ import Data.Typeable
------------------------------------------------------------------------------
import Snap.Iteratee hiding (Enumerator)
import Snap.Internal.Http.Types
-import Snap.Internal.Debug
import Snap.Internal.Iteratee.Debug
@@ -220,12 +219,8 @@ unsafeDetachRequestBody = do
let (SomeEnumerator enum) = senum
liftIO $ writeIORef ioref
(SomeEnumerator $ return . Iter.joinI . Iter.take 0)
-
- modifyResponse $ \rsp -> rsp { rspDetachedBody = True }
-
return $ SomeEnumerator
- $ \i -> enum $
- iterateeDebugWrapper "unsafeDetachRequestBody" i
+ $ \i -> enum (iterateeDebugWrapper "unsafeDetachRequestBody" i)
------------------------------------------------------------------------------
-----------------------------------------------------------------------
hooks/post-receive
--
snap-core
_______________________________________________
Snap mailing list
[email protected]
http://mailman-mail5.webfaction.com/listinfo/snap
