mighttpd2 3.2.1 → 3.2.2

raw patch · 3 files changed

+6/−2 lines, 3 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

mighttpd2.cabal +2/−1
src/Mighty.hs +2/−0
src/Server.hs +2/−1

mighttpd2.cabal view

@@ -1,5 +1,5 @@ Name:                   mighttpd2-Version:                3.2.1+Version:                3.2.2 Author:                 Kazu Yamamoto <kazu@iij.ad.jp> Maintainer:             Kazu Yamamoto <kazu@iij.ad.jp> License:                BSD3@@ -67,6 +67,7 @@   GHC-Options:          -Wall -threaded -rtsopts   if flag(tls)     Cpp-Options:        -DTLS+    Build-Depends:      async   Build-Depends:        base >= 4.0 && < 5                       , bytestring                       , directory

src/Mighty.hs view

@@ -2,7 +2,9 @@  module Main where +#ifndef TLS import Control.Monad (when)+#endif import Data.Version (showVersion) import Network.Wai.Application.Classic hiding ((</>), (+++)) import System.Directory (getCurrentDirectory)

src/Server.hs view

@@ -21,6 +21,7 @@ #ifdef TLS import Control.Concurrent.Async (concurrently) import Network.Wai.Handler.WarpTLS+import Control.Monad (void) #endif  import Program.Mighty@@ -133,7 +134,7 @@     HttpOnly s  -> runSettingsSocket setting s app #ifdef TLS     HttpsOnly s -> runTLSSocket tlsSetting setting s app-    HttpAndHttps s1 s2 -> concurrently+    HttpAndHttps s1 s2 -> void $ concurrently         (runSettingsSocket setting s1 app)         (runTLSSocket tlsSetting setting s2 app) #else