mighttpd2 3.1.2 → 3.1.3

raw patch · 2 files changed

+6/−10 lines, 2 filesdep ~wai-loggerPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: wai-logger

API changes (from Hackage documentation)

Files

• mighttpd2.cabal +2/−2
• src/Server.hs +4/−8

@@ -1,5 +1,5 @@ Name:                   mighttpd2-Version:                3.1.2+Version:                3.1.3 Author:                 Kazu Yamamoto <kazu@iij.ad.jp> Maintainer:             Kazu Yamamoto <kazu@iij.ad.jp> License:                BSD3@@ -80,7 +80,7 @@                       , unix                       , wai >= 3.0                       , wai-app-file-cgi >= 3.0-                      , wai-logger >= 2.1+                      , wai-logger >= 2.2                       , warp >= 3.0   if flag(tls)     Build-Depends:      tls

@@ -54,7 +54,6 @@  ---------------------------------------------------------------- -type LogFlusher = IO () type LogRotator = IO () type LogRemover = IO () @@ -71,7 +70,6 @@     (zdater,zupdater) <- clockDateCacher     ap <- initLogger FromSocket logtype zdater     let lgr = apacheLogger ap-        flusher = logFlusher ap         rotator = logRotator ap         remover = logRemover ap     (getInfo,cleaner) <- fileCacheInit@@ -80,7 +78,7 @@     setHandlers opt rpt svc stt remover mighty     report rpt "Mighty started"     void . forkIO $ mighty route-    mainLoop rpt stt cleaner flusher remover debug rotator zupdater 0+    mainLoop rpt stt cleaner remover debug rotator zupdater 0   where     debug = opt_debug_mode opt     port = opt_port opt@@ -195,10 +193,10 @@ ----------------------------------------------------------------  mainLoop :: Reporter -> Stater -> RemoveInfo-         -> LogFlusher -> LogRemover -> Bool -> LogRotator+         -> LogRemover -> Bool -> LogRotator          -> DateCacheUpdater          -> Int -> IO ()-mainLoop rpt stt cleaner flusher remover everySecond rotator zupdater sec = do+mainLoop rpt stt cleaner remover everySecond rotator zupdater sec = do     threadDelay oneSecond     retiring <- isRetiring stt     counter <- getConnectionCounter stt@@ -209,14 +207,12 @@         exitSuccess       else do         zupdater-        when everySecond flusher         let longTimer = sec == longTimerInterval         when longTimer $ do-            unless everySecond flusher             cleaner             rotator         let !next = if longTimer then 0 else sec + 1-        mainLoop rpt stt cleaner flusher remover everySecond rotator zupdater next+        mainLoop rpt stt cleaner remover everySecond rotator zupdater next  ----------------------------------------------------------------