Merge pull request yesodweb#915 from flipstone/install-shutdown-handl…

…er-in-tls Install settings shutdown handler for TLS servers
kazu-yamamoto · Oct 2, 2023 · e6a8cfe · e6a8cfe
2 parents e9024f0 + 2b48ca7
commit e6a8cfe
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/warp-tls/ChangeLog.md b/warp-tls/ChangeLog.md
@@ -1,5 +1,9 @@
 # ChangeLog
 
+## 3.4.3
+
+* Install shutdown handlers passed via `Settings` to `run...` functions
+
 ## 3.4.1
 
 * Requiring warp v3.3.29.

diff --git a/warp-tls/Network/Wai/Handler/WarpTLS.hs b/warp-tls/Network/Wai/Handler/WarpTLS.hs
@@ -223,6 +223,7 @@ getSessionManager TLSSettings{..} = case tlsSessionManagerConfig of
 --   specified 'Socket'.
 runTLSSocket :: TLSSettings -> Settings -> Socket -> Application -> IO ()
 runTLSSocket tlsset set sock app = do
+    settingsInstallShutdownHandler set (close sock)
     credentials <- loadCredentials tlsset
     mgr <- getSessionManager tlsset
     runTLSSocket' tlsset set credentials mgr sock app

diff --git a/warp-tls/warp-tls.cabal b/warp-tls/warp-tls.cabal
@@ -1,5 +1,5 @@
 Name:                warp-tls
-Version:             3.4.2
+Version:             3.4.3
 Synopsis:            HTTP over TLS support for Warp via the TLS package
 License:             MIT
 License-file:        LICENSE