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 c13e52755c5b6ba190ed5cb5c097c4e7d06f23fd (commit)
from f4e539cf4c42f3a39f89188b172d521938ad5dba (commit)
Summary of changes:
src/Snap/Internal/Http/Parser.hs | 3 +--
src/Snap/Internal/Http/Server.hs | 16 +++++++---------
2 files changed, 8 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 c13e52755c5b6ba190ed5cb5c097c4e7d06f23fd
Author: Luke Hoersten <[email protected]>
Date: Sat Dec 11 19:05:48 2010 -0600
Cleaned up compiler warnings by removing redundant Prelude import and
resolving variable shadowing.
diff --git a/src/Snap/Internal/Http/Parser.hs b/src/Snap/Internal/Http/Parser.hs
index 6165296..fbe9a3c 100644
--- a/src/Snap/Internal/Http/Parser.hs
+++ b/src/Snap/Internal/Http/Parser.hs
@@ -41,7 +41,6 @@ import qualified Data.Vector.Unboxed as Vec
import Data.Vector.Unboxed (Vector)
import Data.Word (Word8, Word64)
import Prelude hiding (head, take, takeWhile)
-import qualified Prelude
------------------------------------------------------------------------------
import Snap.Internal.Http.Types
import Snap.Internal.Debug
@@ -146,7 +145,7 @@ writeChunkedTransferEncoding = checkDone start
lift $ runIteratee $ enumLBS o (Continue k)
-
+
bufIt :: Int
-> DList ByteString
-> (Stream ByteString -> Iteratee ByteString IO a)
diff --git a/src/Snap/Internal/Http/Server.hs b/src/Snap/Internal/Http/Server.hs
index 81db8fd..ba6a8c6 100644
--- a/src/Snap/Internal/Http/Server.hs
+++ b/src/Snap/Internal/Http/Server.hs
@@ -132,9 +132,9 @@ httpServe ports mevType localHostname alogPath elogPath
handler =
if initHttps
then TLS.initTLS
else return ()
-
+
nports <- mapM bindPort ports
-
+
(runEventLoop evType nports numCapabilities (logE elog) $
runHTTP alog elog handler localHostname) `finally` do
@@ -445,15 +445,15 @@ receiveRequest = do
joinI $ takeExactly len st'
noContentLength :: Request -> ServerMonad ()
- noContentLength req = liftIO $ do
+ noContentLength rq = liftIO $ do
debug ("receiveRequest/setEnumerator: " ++
"request did NOT have content-length")
let enum = SomeEnumerator $
- if rqMethod req == POST || rqMethod req == PUT
+ if rqMethod rq == POST || rqMethod rq == PUT
then returnI
else iterateeDebugWrapper "noContentLength" .
joinI . I.take 0
- writeIORef (rqBody req) enum
+ writeIORef (rqBody rq) enum
debug "receiveRequest/setEnumerator: body enumerator set"
@@ -496,7 +496,7 @@ receiveRequest = do
let ii = iterateeDebugWrapper "regurgitate body" (returnI st)
st' <- lift $ runIteratee ii
e st'
-
+
liftIO $ writeIORef (rqBody req) $ SomeEnumerator e'
return $ req { rqParams = rqParams req `mappend` newParams }
@@ -768,7 +768,7 @@ sendResponse req rsp' writeEnd onSendFile = do
putByteString "\r\n"
putHdrs $ headers r
putByteString "\r\n"
-
+
------------------------------------------------------------------------------
checkConnectionClose :: (Int, Int) -> Headers -> ServerMonad ()
@@ -808,5 +808,3 @@ l2s = S.concat . L.toChunks
------------------------------------------------------------------------------
toBS :: String -> ByteString
toBS = S.pack . map c2w
-
-
-----------------------------------------------------------------------
hooks/post-receive
--
snap-server
_______________________________________________
Snap mailing list
[email protected]
http://mailman-mail5.webfaction.com/listinfo/snap
