mighttpd2 2.6.0 → 2.7.0
raw patch · 3 files changed
+10/−9 lines, 3 filesdep ~waidep ~warp
Dependency ranges changed: wai, warp
Files
- Utils.hs +2/−1
- mighttpd2.cabal +4/−4
- test/Test.hs +4/−4
Utils.hs view
@@ -6,6 +6,7 @@ import Data.IORef import Data.ByteString (ByteString) import qualified Data.ByteString.Char8 as BS+import System.IO ---------------------------------------------------------------- @@ -13,7 +14,7 @@ ignore _ = return () printStdout :: SomeException -> IO ()-printStdout = print+printStdout x = print x >> hFlush stdout ----------------------------------------------------------------
mighttpd2.cabal view
@@ -1,5 +1,5 @@ Name: mighttpd2-Version: 2.6.0+Version: 2.7.0 Author: Kazu Yamamoto <kazu@iij.ad.jp> Maintainer: Kazu Yamamoto <kazu@iij.ad.jp> License: BSD3@@ -17,7 +17,7 @@ Executable mighty Main-Is: Mighty.hs- GHC-Options: -Wall -threaded+ GHC-Options: -Wall -threaded -eventlog Build-Depends: base >= 4.0 && < 5 -- should be removed someday , blaze-html >= 0.5@@ -41,11 +41,11 @@ , unix-bytestring , unix-time , unordered-containers- , wai >= 1.1+ , wai >= 1.3 , wai-app-file-cgi , wai-logger , wai-logger-prefork- , warp >= 1.2.1.1+ , warp >= 1.3 Other-Modules: Config Config.Internal FileCGIApp
test/Test.hs view
@@ -18,16 +18,16 @@ case_config :: Assertion case_config = do- res <- parseConfig "sample.conf"+ res <- parseConfig "example.conf" res @?= ans where- ans = [("Port",CV_Int 80),("Debug_Mode",CV_Bool True),("User",CV_String "nobody"),("Group",CV_String "nobody"),("Pid_File",CV_String "/var/run/mighty.pid"),("Logging",CV_Bool True),("Log_File",CV_String "/var/log/mighty"),("Log_File_Size",CV_Int 16777216),("Log_Backup_Number",CV_Int 10),("Index_File",CV_String "index.html"),("Index_Cgi",CV_String "index.cgi"),("Status_File_Dir",CV_String "/usr/local/share/mighty/status"),("Connection_Timeout",CV_Int 30),("Worker_Processes",CV_Int 1)]+ ans = [("Port",CV_Int 80),("Debug_Mode",CV_Bool True),("User",CV_String "root"),("Group",CV_String "root"),("Pid_File",CV_String "/var/run/mighty.pid"),("Logging",CV_Bool True),("Log_File",CV_String "/var/log/mighty"),("Log_File_Size",CV_Int 16777216),("Log_Backup_Number",CV_Int 10),("Index_File",CV_String "index.html"),("Index_Cgi",CV_String "index.cgi"),("Status_File_Dir",CV_String "/usr/local/share/mighty/status"),("Connection_Timeout",CV_Int 30),("Worker_Processes",CV_Int 1)] case_route :: Assertion case_route = do- res <- parseRoute "sample.route"+ res <- parseRoute "example.route" res @?= ans where- ans = [Block ["localhost","www.example.com"] [RouteCGI "/~alice/cgi-bin/" "/home/alice/public_html/cgi-bin/",RouteFile "/~alice/" "/home/alice/public_html/",RouteCGI "/cgi-bin/" "/export/cgi-bin/",RouteRevProxy "/app/cal/" "/calendar/" "example.net" 80,RouteRevProxy "/app/wiki/" "/" "127.0.0.1" 8080,RouteFile "/" "/export/www/"]]+ ans = [Block ["localhost","www.example.com"] [RouteCGI "/~alice/cgi-bin/" "/home/alice/public_html/cgi-bin/",RouteFile "/~alice/" "/home/alice/public_html/",RouteCGI "/cgi-bin/" "/export/cgi-bin/",RouteRevProxy "/app/cal/" "/calendar/" "example.net" 80,RouteRevProxy "/app/wiki/" "/" "127.0.0.1" 3000,RouteFile "/" "/export/www/"]] ----------------------------------------------------------------