mighttpd2 3.2.8 → 3.2.9

raw patch · 9 files changed

+25/−3 lines, 9 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• Program/Mighty/Config.hs +3/−0
• Program/Mighty/Parser.hs +4/−0
• Program/Mighty/Process.hs +3/−0
• Program/Mighty/Report.hs +3/−0
• Program/Mighty/Resource.hs +4/−0
• Program/Mighty/Route.hs +3/−0
• conf/example.conf +2/−2
• mighttpd2.cabal +1/−1
• utils/mkindex.hs +2/−0

@@ -1,4 +1,5 @@ {-# LANGUAGE FlexibleInstances, TypeSynonymInstances, OverloadedStrings #-}+{-# LANGUAGE CPP #-}  module Program.Mighty.Config (   -- * Parsing a configuration file.@@ -9,7 +10,9 @@   , Option(..)   ) where +#if __GLASGOW_HASKELL__ < 709 import Control.Applicative hiding (many,optional,(<|>))+#endif import Program.Mighty.Parser import Text.Parsec import Text.Parsec.ByteString.Lazy

@@ -1,3 +1,5 @@+{-# LANGUAGE CPP #-}+ -- | Parsers for Mighty  module Program.Mighty.Parser (@@ -12,7 +14,9 @@   , comment   ) where +#if __GLASGOW_HASKELL__ < 709 import Control.Applicative hiding (many,(<|>))+#endif import Control.Exception import qualified Data.ByteString.Lazy.Char8 as BL import System.IO

@@ -1,10 +1,13 @@ {-# LANGUAGE OverloadedStrings #-}+{-# LANGUAGE CPP #-}  module Program.Mighty.Process (     getMightyPid   ) where +#if __GLASGOW_HASKELL__ < 709 import Control.Applicative+#endif import Control.Monad.Trans.Resource (runResourceT) import Data.ByteString.Char8 (ByteString) import qualified Data.ByteString.Char8 as BS

@@ -1,4 +1,5 @@ {-# LANGUAGE OverloadedStrings #-}+{-# LANGUAGE CPP #-}  module Program.Mighty.Report (     Reporter@@ -10,7 +11,9 @@   , printStdout   ) where +#if __GLASGOW_HASKELL__ < 709 import Control.Applicative+#endif import Control.Exception import qualified Control.Exception as E (catch) import Control.Monad

@@ -1,10 +1,14 @@+{-# LANGUAGE CPP #-}+ module Program.Mighty.Resource (     amIrootUser   , setGroupUser   , unlimit   ) where +#if __GLASGOW_HASKELL__ < 709 import Control.Applicative+#endif import Control.Exception import Control.Monad import System.Posix

@@ -1,4 +1,5 @@ {-# LANGUAGE OverloadedStrings, TupleSections #-}+{-# LANGUAGE CPP #-}  module Program.Mighty.Route (   -- * Paring a routing file@@ -18,7 +19,9 @@   , writeRouteDBRef   ) where +#if __GLASGOW_HASKELL__ < 709 import Control.Applicative hiding (many,(<|>))+#endif import Control.Monad import Data.ByteString import qualified Data.ByteString.Char8 as BS

@@ -20,6 +20,6 @@ # Server_Name: Mighttpd/3.x.y Tls_Port: 443 Tls_Cert_File: certificate.pem # should change this with an absolute path-# Currently, Tls_Key_file must not be encrypted.-Tls_Key_file: key.pem # should change this with an absolute path+# Currently, Tls_Key_File must not be encrypted.+Tls_Key_File: key.pem # should change this with an absolute path Service: 0 # 0 is HTTP only, 1 is HTTPS only, 2 is both

@@ -1,5 +1,5 @@ Name:                   mighttpd2-Version:                3.2.8+Version:                3.2.9 Author:                 Kazu Yamamoto <kazu@iij.ad.jp> Maintainer:             Kazu Yamamoto <kazu@iij.ad.jp> License:                BSD3

@@ -2,7 +2,9 @@  -- mkindex :: Making index.html for the current directory. +#if __GLASGOW_HASKELL__ < 709 import Control.Applicative+#endif import Data.Bits import Data.Time (formatTime) import Data.Time.Clock.POSIX