cgi 3001.1.7.4 → 3001.1.7.5
raw patch · 4 files changed
+29/−8 lines, 4 filesdep ~basePVP: major bump suggested
API removals or changes: PVP suggests a major version bump
Dependency ranges changed: base
API changes (from Hackage documentation)
- Network.CGI.Monad: instance (Monad m) => Monad (CGIT m)
- Network.CGI.Monad: instance (Monad m) => MonadCGI (CGIT m)
- Network.CGI.Monad: instance (MonadIO m) => MonadIO (CGIT m)
+ Network.CGI.Monad: instance Monad m => Monad (CGIT m)
+ Network.CGI.Monad: instance Monad m => MonadCGI (CGIT m)
+ Network.CGI.Monad: instance MonadIO m => MonadIO (CGIT m)
- Network.CGI: authType :: (MonadCGI m) => m (Maybe String)
+ Network.CGI: authType :: MonadCGI m => m (Maybe String)
- Network.CGI: class (Eq a) => Acceptable a
+ Network.CGI: class Eq a => Acceptable a
- Network.CGI: class (Monad m) => MonadCGI m
+ Network.CGI: class Monad m => MonadCGI m
- Network.CGI: class (Monad m) => MonadIO m :: (* -> *)
+ Network.CGI: class Monad m => MonadIO (m :: * -> *)
- Network.CGI: deleteCookie :: (MonadCGI m) => Cookie -> m ()
+ Network.CGI: deleteCookie :: MonadCGI m => Cookie -> m ()
- Network.CGI: getBody :: (MonadCGI m) => m String
+ Network.CGI: getBody :: MonadCGI m => m String
- Network.CGI: getBodyFPS :: (MonadCGI m) => m ByteString
+ Network.CGI: getBodyFPS :: MonadCGI m => m ByteString
- Network.CGI: getCookie :: (MonadCGI m) => String -> m (Maybe String)
+ Network.CGI: getCookie :: MonadCGI m => String -> m (Maybe String)
- Network.CGI: getInput :: (MonadCGI m) => String -> m (Maybe String)
+ Network.CGI: getInput :: MonadCGI m => String -> m (Maybe String)
- Network.CGI: getInputContentType :: (MonadCGI m) => String -> m (Maybe String)
+ Network.CGI: getInputContentType :: MonadCGI m => String -> m (Maybe String)
- Network.CGI: getInputFPS :: (MonadCGI m) => String -> m (Maybe ByteString)
+ Network.CGI: getInputFPS :: MonadCGI m => String -> m (Maybe ByteString)
- Network.CGI: getInputFilename :: (MonadCGI m) => String -> m (Maybe String)
+ Network.CGI: getInputFilename :: MonadCGI m => String -> m (Maybe String)
- Network.CGI: getInputNames :: (MonadCGI m) => m [String]
+ Network.CGI: getInputNames :: MonadCGI m => m [String]
- Network.CGI: getInputs :: (MonadCGI m) => m [(String, String)]
+ Network.CGI: getInputs :: MonadCGI m => m [(String, String)]
- Network.CGI: getInputsFPS :: (MonadCGI m) => m [(String, ByteString)]
+ Network.CGI: getInputsFPS :: MonadCGI m => m [(String, ByteString)]
- Network.CGI: getMultiInput :: (MonadCGI m) => String -> m [String]
+ Network.CGI: getMultiInput :: MonadCGI m => String -> m [String]
- Network.CGI: getMultiInputFPS :: (MonadCGI m) => String -> m [ByteString]
+ Network.CGI: getMultiInputFPS :: MonadCGI m => String -> m [ByteString]
- Network.CGI: getVar :: (MonadCGI m) => String -> m (Maybe String)
+ Network.CGI: getVar :: MonadCGI m => String -> m (Maybe String)
- Network.CGI: getVarWithDefault :: (MonadCGI m) => String -> String -> m String
+ Network.CGI: getVarWithDefault :: MonadCGI m => String -> String -> m String
- Network.CGI: getVars :: (MonadCGI m) => m [(String, String)]
+ Network.CGI: getVars :: MonadCGI m => m [(String, String)]
- Network.CGI: liftIO :: (MonadIO m) => forall a. IO a -> m a
+ Network.CGI: liftIO :: MonadIO m => forall a. IO a -> m a
- Network.CGI: logCGI :: (MonadIO m) => String -> m ()
+ Network.CGI: logCGI :: MonadIO m => String -> m ()
- Network.CGI: negotiate :: (Acceptable a) => [a] -> Maybe (Accept a) -> [a]
+ Network.CGI: negotiate :: Acceptable a => [a] -> Maybe (Accept a) -> [a]
- Network.CGI: output :: (MonadCGI m) => String -> m CGIResult
+ Network.CGI: output :: MonadCGI m => String -> m CGIResult
- Network.CGI: outputFPS :: (MonadCGI m) => ByteString -> m CGIResult
+ Network.CGI: outputFPS :: MonadCGI m => ByteString -> m CGIResult
- Network.CGI: outputNothing :: (MonadCGI m) => m CGIResult
+ Network.CGI: outputNothing :: MonadCGI m => m CGIResult
- Network.CGI: parseContentType :: (Monad m) => String -> m ContentType
+ Network.CGI: parseContentType :: Monad m => String -> m ContentType
- Network.CGI: pathInfo :: (MonadCGI m) => m String
+ Network.CGI: pathInfo :: MonadCGI m => m String
- Network.CGI: pathTranslated :: (MonadCGI m) => m String
+ Network.CGI: pathTranslated :: MonadCGI m => m String
- Network.CGI: progURI :: (MonadCGI m) => m URI
+ Network.CGI: progURI :: MonadCGI m => m URI
- Network.CGI: queryString :: (MonadCGI m) => m String
+ Network.CGI: queryString :: MonadCGI m => m String
- Network.CGI: queryURI :: (MonadCGI m) => m URI
+ Network.CGI: queryURI :: MonadCGI m => m URI
- Network.CGI: redirect :: (MonadCGI m) => String -> m CGIResult
+ Network.CGI: redirect :: MonadCGI m => String -> m CGIResult
- Network.CGI: remoteAddr :: (MonadCGI m) => m String
+ Network.CGI: remoteAddr :: MonadCGI m => m String
- Network.CGI: remoteHost :: (MonadCGI m) => m (Maybe String)
+ Network.CGI: remoteHost :: MonadCGI m => m (Maybe String)
- Network.CGI: remoteUser :: (MonadCGI m) => m (Maybe String)
+ Network.CGI: remoteUser :: MonadCGI m => m (Maybe String)
- Network.CGI: requestAccept :: (MonadCGI m) => m (Maybe (Accept ContentType))
+ Network.CGI: requestAccept :: MonadCGI m => m (Maybe (Accept ContentType))
- Network.CGI: requestAcceptCharset :: (MonadCGI m) => m (Maybe (Accept Charset))
+ Network.CGI: requestAcceptCharset :: MonadCGI m => m (Maybe (Accept Charset))
- Network.CGI: requestAcceptEncoding :: (MonadCGI m) => m (Maybe (Accept ContentEncoding))
+ Network.CGI: requestAcceptEncoding :: MonadCGI m => m (Maybe (Accept ContentEncoding))
- Network.CGI: requestAcceptLanguage :: (MonadCGI m) => m (Maybe (Accept Language))
+ Network.CGI: requestAcceptLanguage :: MonadCGI m => m (Maybe (Accept Language))
- Network.CGI: requestContentLength :: (MonadCGI m) => m (Maybe Int)
+ Network.CGI: requestContentLength :: MonadCGI m => m (Maybe Int)
- Network.CGI: requestContentType :: (MonadCGI m) => m (Maybe String)
+ Network.CGI: requestContentType :: MonadCGI m => m (Maybe String)
- Network.CGI: requestHeader :: (MonadCGI m) => String -> m (Maybe String)
+ Network.CGI: requestHeader :: MonadCGI m => String -> m (Maybe String)
- Network.CGI: requestMethod :: (MonadCGI m) => m String
+ Network.CGI: requestMethod :: MonadCGI m => m String
- Network.CGI: requestURI :: (MonadCGI m) => m URI
+ Network.CGI: requestURI :: MonadCGI m => m URI
- Network.CGI: runCGI :: (MonadIO m) => CGIT m CGIResult -> m ()
+ Network.CGI: runCGI :: MonadIO m => CGIT m CGIResult -> m ()
- Network.CGI: scriptName :: (MonadCGI m) => m String
+ Network.CGI: scriptName :: MonadCGI m => m String
- Network.CGI: serverName :: (MonadCGI m) => m String
+ Network.CGI: serverName :: MonadCGI m => m String
- Network.CGI: serverPort :: (MonadCGI m) => m Int
+ Network.CGI: serverPort :: MonadCGI m => m Int
- Network.CGI: setCookie :: (MonadCGI m) => Cookie -> m ()
+ Network.CGI: setCookie :: MonadCGI m => Cookie -> m ()
- Network.CGI: setHeader :: (MonadCGI m) => String -> String -> m ()
+ Network.CGI: setHeader :: MonadCGI m => String -> String -> m ()
- Network.CGI: setStatus :: (MonadCGI m) => Int -> String -> m ()
+ Network.CGI: setStatus :: MonadCGI m => Int -> String -> m ()
- Network.CGI.Monad: cgiAddHeader :: (MonadCGI m) => HeaderName -> String -> m ()
+ Network.CGI.Monad: cgiAddHeader :: MonadCGI m => HeaderName -> String -> m ()
- Network.CGI.Monad: cgiGet :: (MonadCGI m) => (CGIRequest -> a) -> m a
+ Network.CGI.Monad: cgiGet :: MonadCGI m => (CGIRequest -> a) -> m a
- Network.CGI.Monad: class (Monad m) => MonadCGI m
+ Network.CGI.Monad: class Monad m => MonadCGI m
- Network.CGI.Monad: runCGIT :: (Monad m) => CGIT m a -> CGIRequest -> m (Headers, a)
+ Network.CGI.Monad: runCGIT :: Monad m => CGIT m a -> CGIRequest -> m (Headers, a)
- Network.CGI.Protocol: getCGIVars :: (MonadIO m) => m [(String, String)]
+ Network.CGI.Protocol: getCGIVars :: MonadIO m => m [(String, String)]
- Network.CGI.Protocol: hRunCGI :: (MonadIO m) => [(String, String)] -> Handle -> Handle -> (CGIRequest -> m (Headers, CGIResult)) -> m ()
+ Network.CGI.Protocol: hRunCGI :: MonadIO m => [(String, String)] -> Handle -> Handle -> (CGIRequest -> m (Headers, CGIResult)) -> m ()
- Network.CGI.Protocol: logCGI :: (MonadIO m) => String -> m ()
+ Network.CGI.Protocol: logCGI :: MonadIO m => String -> m ()
- Network.CGI.Protocol: maybeRead :: (Read a) => String -> Maybe a
+ Network.CGI.Protocol: maybeRead :: Read a => String -> Maybe a
- Network.CGI.Protocol: replace :: (Eq a) => a -> a -> [a] -> [a]
+ Network.CGI.Protocol: replace :: Eq a => a -> a -> [a] -> [a]
- Network.CGI.Protocol: runCGIEnvFPS :: (Monad m) => [(String, String)] -> ByteString -> (CGIRequest -> m (Headers, CGIResult)) -> m ByteString
+ Network.CGI.Protocol: runCGIEnvFPS :: Monad m => [(String, String)] -> ByteString -> (CGIRequest -> m (Headers, CGIResult)) -> m ByteString
Files
- Network/CGI.hs +6/−1
- Network/CGI/Compat.hs +7/−2
- Network/CGI/Monad.hs +6/−1
- cgi.cabal +10/−4
Network/CGI.hs view
@@ -94,7 +94,12 @@ , module Network.CGI.Compat ) where -import Control.Exception.Extensible (Exception(..), SomeException, ErrorCall(..))+#if MIN_VERSION_base(4,0,0)+import Control.Exception+#else+import Control.Exception.Extensible+#endif+ (Exception(..), SomeException, ErrorCall(..)) import Control.Monad (liftM) import Control.Monad.Trans (MonadIO, liftIO) import Data.Char (toUpper)
Network/CGI/Compat.hs view
@@ -20,7 +20,12 @@ ) where import Control.Concurrent (forkIO)-import Control.Exception.Extensible as Exception (SomeException,throw,catch,finally)+#if MIN_VERSION_base(4,0,0)+import Control.Exception+#else+import Control.Exception.Extensible+#endif+ as Exception (SomeException, throw, catch, finally) import Control.Monad (unless) import Control.Monad.Trans (MonadIO, liftIO) import qualified Data.Map as Map@@ -89,7 +94,7 @@ (\ e -> abort "Cannot connect to CGI daemon." e) BS.hPut h str >> hPutStrLn h "" (sendBack h `finally` hClose h)- `Prelude.catch` (\e -> unless (isEOFError e) (ioError e))+ `Exception.catch` (\e -> unless (isEOFError e) (ioError e)) -- | Returns the query string, or the request body if it is -- a POST request, or the empty string if there is an error.
Network/CGI/Monad.hs view
@@ -27,7 +27,12 @@ throwCGI, catchCGI, tryCGI, handleExceptionCGI, ) where -import Control.Exception.Extensible as Exception (SomeException, try, throwIO)+#if MIN_VERSION_base(4,0,0)+import Control.Exception+#else+import Control.Exception.Extensible+#endif+ as Exception (SomeException, try, throwIO) import Control.Monad (liftM) import Control.Monad.Error (MonadError(..)) import Control.Monad.Reader (ReaderT(..), asks)
cgi.cabal view
@@ -1,5 +1,5 @@ Name: cgi-Version: 3001.1.7.4+Version: 3001.1.7.5 Copyright: Bjorn Bringert, Andy Gill, Anders Kaseorg, Ian Lynagh, Erik Meijer, Sven Panne, Jeremy Shaw Category: Network@@ -16,6 +16,7 @@ Flag split-base Flag bytestring-in-base+Flag extensible-exceptions-in-base Library Exposed-Modules:@@ -28,15 +29,16 @@ Network.CGI.Accept, Network.CGI.Multipart, Network.CGI.Header- Extensions: MultiParamTypeClasses+ Extensions:+ CPP,+ MultiParamTypeClasses ghc-options: -Wall Build-depends: network >= 2.0, parsec >= 2.0, mtl >= 1.0,- xhtml >= 3000.0.0,- extensible-exceptions+ xhtml >= 3000.0.0 If flag(split-base) Build-depends: base >= 3 && < 5, old-time, old-locale, containers Else@@ -45,6 +47,10 @@ Build-depends: base >= 2 && < 3 Else Build-depends: base < 2 || < 5, bytestring+ If flag(extensible-exceptions-in-base)+ Build-depends: base >= 4+ Else+ Build-depends: base < 4, extensible-exceptions --Executable: printinput --Main-Is: printinput.hs