cgi 3001.1.7.2 → 3001.1.7.3

raw patch · 4 files changed

+17/−10 lines, 4 filesdep +extensible-exceptionsnew-uploaderPVP ok

version bump matches the API change (PVP)

Dependencies added: extensible-exceptions

API changes (from Hackage documentation)

Files

• Network/CGI.hs +4/−3
• Network/CGI/Compat.hs +1/−1
• Network/CGI/Monad.hs +1/−1
• cgi.cabal +11/−5

@@ -94,7 +94,7 @@   , module Network.CGI.Compat   ) where -import Control.Exception (Exception(..), SomeException, ErrorCall(..))+import Control.Exception.Extensible (Exception(..), SomeException, ErrorCall(..)) import Control.Monad (liftM) import Control.Monad.Trans (MonadIO, liftIO) import Data.Char (toUpper)@@ -186,8 +186,9 @@ --   an 'Exception'. outputException :: (MonadCGI m,MonadIO m) => SomeException -> m CGIResult outputException e = outputInternalServerError es-    where es | Just (ErrorCall msg) <- fromException e = [msg]-             | otherwise                               = [show e]+    where es = case fromException e of+                 Just (ErrorCall msg) -> [msg]+                 _ -> [show e]  -- | Output an error page to the user, with the given --   HTTP status code in the response. Also logs the error information

@@ -20,7 +20,7 @@   ) where  import Control.Concurrent (forkIO)-import Control.Exception as Exception (SomeException,throw,catch,finally)+import Control.Exception.Extensible as Exception (SomeException,throw,catch,finally) import Control.Monad (unless) import Control.Monad.Trans (MonadIO, liftIO) import qualified Data.Map as Map

@@ -27,7 +27,7 @@   throwCGI, catchCGI, tryCGI, handleExceptionCGI,  ) where -import Control.Exception as Exception (SomeException, try, throwIO)+import Control.Exception.Extensible as Exception (SomeException, try, throwIO) import Control.Monad (liftM) import Control.Monad.Error (MonadError(..)) import Control.Monad.Reader (ReaderT(..), asks)

@@ -1,10 +1,11 @@ Name: cgi-Version: 3001.1.7.2-Copyright: Bjorn Bringert, Andy Gill, Ian Lynagh, Erik Meijer, -           Sven Panne, Jeremy Shaw+Version: 3001.1.7.3+Copyright: Bjorn Bringert, Andy Gill, Anders Kaseorg, Ian Lynagh, +           Erik Meijer, Sven Panne, Jeremy Shaw Category: Network-Maintainer: bjorn@bringert.net+Maintainer: Anders Kaseorg <andersk@mit.edu> Author: Bjorn Bringert+Homepage: http://andersk.mit.edu/haskell/cgi/ License: BSD3 License-file: LICENSE Synopsis: A library for writing CGI programs@@ -30,7 +31,12 @@   Extensions: MultiParamTypeClasses   ghc-options: -Wall -  Build-depends: network>=2.0, parsec >= 2.0, mtl >= 1.0, xhtml >= 3000.0.0+  Build-depends:+    network >= 2.0,+    parsec >= 2.0,+    mtl >= 1.0,+    xhtml >= 3000.0.0,+    extensible-exceptions   If flag(split-base)     Build-depends: base >= 3 && < 5, old-time, old-locale, containers   Else