mighttpd2 3.4.1 → 3.4.2

raw patch · 2 files changed

+11/−4 lines, 2 filesdep +tls-session-managerPVP ok

version bump matches the API change (PVP)

Dependencies added: tls-session-manager

API changes (from Hackage documentation)

Files

• mighttpd2.cabal +3/−3
• src/Server.hs +8/−1

@@ -1,5 +1,5 @@ Name:                   mighttpd2-Version:                3.4.1+Version:                3.4.2 Author:                 Kazu Yamamoto <kazu@iij.ad.jp> Maintainer:             Kazu Yamamoto <kazu@iij.ad.jp> License:                BSD3@@ -67,6 +67,7 @@   if flag(tls)     Cpp-Options:        -DHTTP_OVER_TLS     Build-Depends:      async+                      , tls-session-manager   Build-Depends:        base >= 4.0 && < 5                       , bytestring                       , directory@@ -88,8 +89,7 @@   if flag(tls)     Build-Depends:      tls                       , warp-tls >= 3.2 && < 3.3-  Other-Modules:        Mighty-                        Server+  Other-Modules:        Server                         WaiApp                         Paths_mighttpd2 

@@ -6,8 +6,10 @@ import Control.Exception (try) import Control.Monad (unless, when) import qualified Data.ByteString.Char8 as BS+#ifdef HTTP_OVER_TLS import Data.Char (isSpace) import Data.List (dropWhile, dropWhileEnd, break)+#endif import Data.Streaming.Network (bindPortTCP) import Network (Socket, sClose) import qualified Network.HTTP.Client as H@@ -29,6 +31,7 @@ import Control.Concurrent.Async (concurrently) import Control.Monad (void) import Network.Wai.Handler.WarpTLS+import Network.TLS.SessionManager #else data TLSSettings = TLSSettings #endif@@ -137,7 +140,11 @@                     chain_files = map strip $ split $ opt_tls_chain_files _opt                 chains <- mapM BS.readFile chain_files                 key  <- BS.readFile $ opt_tls_key_file _opt-                return $ tlsSettingsChainMemory cert chains key+                let settings0 = tlsSettingsChainMemory cert chains key+                    settings = settings0 {+                        tlsSessionManagerConfig = Just defaultConfig+                      }+                return settings #else     return TLSSettings #endif