mighttpd 0.1.0 → 0.2.0

raw patch · 4 files changed

+14/−9 lines, 4 files

Files

Config.hs +1/−1
File.hs +6/−4
Mighttpd.hs +1/−1
mighttpd.cabal +6/−3

Config.hs view

@@ -19,7 +19,7 @@   , opt_group = "nobody"   , opt_syslog_facility = "local5"   , opt_log_level = "info"-  , opt_pid_file = "/var/run/pbws.pid"+  , opt_pid_file = "/var/run/mighttpd.pid" }  data Option = Option {

File.hs view

@@ -7,7 +7,7 @@ import Data.Time import Data.Time.Clock.POSIX import IO-import Network.TCPInfo+import Network.Socket import Network.URI import Network.Web.Server import Network.Web.Server.Basic@@ -21,15 +21,17 @@ progName = "Mighttpd"  progVersion :: String-progVersion = "0.1.0"+progVersion = "0.2.0"  progNameVersion :: String progNameVersion = progName ++ " " ++ progVersion  ---------------------------------------------------------------- -mighty :: WebConfig -> URLMap -> Handle -> TCPInfo -> IO ()-mighty wcnf umap hdl tcpinfo = do+mighty :: WebConfig -> URLMap -> Socket -> IO ()+mighty wcnf umap s = do+  tcpinfo <- getTCPInfo s+  hdl <- socketToHandle s ReadWriteMode   let bcnf = BasicConfig { obtain = fileGet                          , info   = fileInfo                          , mapper = fileMapper umap

Mighttpd.hs view

@@ -32,7 +32,7 @@     fileName n = do         args <- getArgs         when (length args /= 2) $ do-            hPutStrLn stderr "Usage: pbws config_file uri_map"+            hPutStrLn stderr "Usage: mighttpd config_file uri_map"             exitFailure         return $ args !! n

mighttpd.cabal view

@@ -1,5 +1,5 @@ Name:                   mighttpd-Version:                0.1.0+Version:                0.2.0 Author:                 Kazu Yamamoto <kazu@iij.ad.jp> Maintainer:             Kazu Yamamoto <kazu@iij.ad.jp> License:                BSD3@@ -11,8 +11,8 @@ Category:               Network Cabal-Version:          >= 1.6 Build-Type:             Simple-Extra-Source-Files:     Config.hs, LogMsg.hs, Setup.hs, File.hs, URLMap.hs-Data-Files:             sample.conf, sample.map+Extra-Source-Files:     Config.hs LogMsg.hs Setup.hs File.hs URLMap.hs+Data-Files:             sample.conf sample.map Executable mighttpd     Main-Is:            Mighttpd.hs     GHC-Options:        -Wall -O2@@ -23,3 +23,6 @@     Main-Is:            mkindex.hs     GHC-Options:        -Wall -O2     Build-Depends:      base >= 4+Source-Repository head+  Type:                 git+  Location:             git://github.com/kazu-yamamoto/mighttpd.git