happstack-server-tls 7.1.6.7 → 7.2.1
raw patch · 3 files changed
+13/−13 lines, 3 filesdep ~happstack-serverdep ~hsloggerdep ~networkPVP ok
version bump matches the API change (PVP)
Dependency ranges changed: happstack-server, hslogger, network
API changes (from Hackage documentation)
Files
- happstack-server-tls.cabal +7/−7
- src/Happstack/Server/Internal/TLS.hs +4/−4
- src/Happstack/Server/Internal/TimeoutSocketTLS.hs +2/−2
happstack-server-tls.cabal view
@@ -1,17 +1,17 @@ Name: happstack-server-tls-Version: 7.1.6.7+Version: 7.2.1 Synopsis: extend happstack-server with https:// support (TLS/SSL)-Description: extend happstack-server with https:// support (TLS/SSL)+Description: Allows you to use https:// without relying on apache, nginx, etc Homepage: http://www.happstack.com/ License: BSD3 License-file: LICENSE Author: Jeremy Shaw Maintainer: jeremy@n-heptane.com-Copyright: 2012 Jeremy Shaw+Copyright: 2012-2019, Jeremy Shaw Category: Web, Happstack Build-type: Simple Cabal-version: >=1.10-tested-with: GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.3, GHC == 8.0.1+tested-with: GHC==8.0.1, GHC==8.2.2, GHC==8.4.1, GHC==8.6.5, GHC==8.8.1 extra-source-files: README.md source-repository head@@ -29,10 +29,10 @@ Build-Depends: base < 5, bytestring >= 0.9 && < 0.11, extensible-exceptions == 0.1.*,- happstack-server >= 6.6.4 && < 7.6,- hslogger >= 1.1 && < 1.3,+ happstack-server >= 6.6.4 && < 7.7,+ hslogger >= 1.1 && < 1.4, HsOpenSSL >= 0.10 && < 0.12,- network >= 2.3 && < 2.9,+ network > 2.6 && < 2.9 || >= 3.0.0 && < 3.2, sendfile == 0.7.*, time >= 1.2 && < 1.10 -- these extra libraries are not needed to build/install the server
src/Happstack/Server/Internal/TLS.hs view
@@ -14,7 +14,7 @@ import Happstack.Server.Internal.TimeoutManager (cancel, initialize, register) import Happstack.Server.Internal.TimeoutSocketTLS as TSS import Happstack.Server.Internal.Types (Request, Response)-import Network.Socket (HostName, PortNumber, Socket, sClose, socketPort)+import Network.Socket (HostName, PortNumber, Socket, close, socketPort) import Prelude hiding (catch) import OpenSSL (withOpenSSL) import OpenSSL.Session (SSL, SSLContext)@@ -90,7 +90,7 @@ -> SSLContext -> IO SSL acceptTLS sck ctx =- handle (\ (e :: SomeException) -> sClose sck >> throwIO e) $ do+ handle (\ (e :: SomeException) -> close sck >> throwIO e) $ do ssl <- SSL.connection ctx sck SSL.accept ssl return ssl@@ -162,13 +162,13 @@ log' NOTICE ("Listening for https:// on port " ++ show sockPort) (infi `catch` (\e -> do log' ERROR ("https:// terminated by " ++ show (e :: SomeException)) throwIO e))- `finally` (sClose lsocket)+ `finally` (close lsocket) where shutdownClose :: Socket -> SSL -> IO () shutdownClose socket ssl = do SSL.shutdown ssl SSL.Unidirectional `E.catch` ignoreException- sClose socket `E.catch` ignoreException+ close socket `E.catch` ignoreException -- exception handlers ignoreConnectionAbruptlyTerminated :: SSL.ConnectionAbruptlyTerminated -> IO ()
src/Happstack/Server/Internal/TimeoutSocketTLS.hs view
@@ -11,7 +11,7 @@ import qualified Data.ByteString as S import qualified Happstack.Server.Internal.TimeoutManager as TM import Happstack.Server.Internal.TimeoutIO (TimeoutIO(..))-import Network.Socket (Socket, sClose)+import Network.Socket (Socket, close) import Network.Socket.SendFile (ByteCount, Offset) import OpenSSL.Session (SSL) import qualified OpenSSL.Session as SSL@@ -49,7 +49,7 @@ timeoutSocketIO handle socket ssl = TimeoutIO { toHandle = handle , toShutdown = do SSL.shutdown ssl SSL.Unidirectional `catch` ignoreException- sClose socket `catch` ignoreException+ close socket `catch` ignoreException , toPutLazy = sPutLazyTickle handle ssl , toPut = sPutTickle handle ssl , toGetContents = sGetContents handle ssl