[Snap Framework] snap-server branch, master, updated. c70890f81eb6543ee18856aac799d204ca5b8806

noreply at snapframework.com noreply at snapframework.com
Tue Apr 20 20:58:53 CDT 2010


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  c70890f81eb6543ee18856aac799d204ca5b8806 (commit)
      from  32b38dab10d1c741221a02702206eeb9a9943afc (commit)


Summary of changes:
 src/Snap/Internal/Http/Server.hs |   12 ------------
 1 files changed, 0 insertions(+), 12 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 c70890f81eb6543ee18856aac799d204ca5b8806
Author: Mighty Byte <mightybyte at gmail.com>
Date:   Tue Apr 20 21:58:40 2010 -0400

    Cleaned up the compiler warnings.

diff --git a/src/Snap/Internal/Http/Server.hs b/src/Snap/Internal/Http/Server.hs
index 51849ad..803a45a 100644
--- a/src/Snap/Internal/Http/Server.hs
+++ b/src/Snap/Internal/Http/Server.hs
@@ -23,12 +23,10 @@ import           Prelude hiding (catch)
 
 import           GHC.Conc
 import           Control.Concurrent.MVar
-import           System.Exit
 import           System.IO.Error hiding (try,catch)
 import           System.FastLogger
 import           GHC.IOBase (IOErrorType(..))
 ------------------------------------------------------------------------------
-import           Snap.Types (NoHandlerException(..))
 import           Snap.Internal.Http.Types hiding (Enumerator)
 import           Snap.Internal.Http.Parser
 import           Snap.Iteratee hiding (foldl', head, take)
@@ -246,8 +244,6 @@ httpSession writeEnd handler = do
 
     case mreq of
       (Just req) -> do
-          --(req',rsp) <- liftIO $ (handler req) `catch` (noHandlerHandler req)
-
           -- FIXME: catch exception
           (req',rsp) <- lift $ handler req
 
@@ -273,14 +269,6 @@ httpSession writeEnd handler = do
              else httpSession writeEnd handler
 
       Nothing -> return ()
-  where
-    noHandlerHandler :: Request
-                     -> NoHandlerException
-                     -> IO (Request, Response)
-    noHandlerHandler req _ = return (req, notFound)
-
-    notFound = Response Map.empty (1,1) Nothing body 404 "Not Found"
-    body = I.enumBS "404 - Not Found\n"
 
 
 receiveRequest :: ServerMonad (Maybe Request)
-----------------------------------------------------------------------


hooks/post-receive
-- 
snap-server


More information about the Snap mailing list