happstack-server-tls 7.0.1 → 7.0.2

raw patch · 2 files changed

+6/−6 lines, 2 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• happstack-server-tls.cabal +1/−1
• src/Happstack/Server/Internal/TLS.hs +5/−5

@@ -1,5 +1,5 @@ Name:                happstack-server-tls-Version:             7.0.1+Version:             7.0.2 Synopsis:            extend happstack-server with https:// support (TLS/SSL) Description:         extend happstack-server with https:// support (TLS/SSL) Homepage:            http://www.happstack.com/

@@ -28,7 +28,7 @@ import System.Posix.Signals                       (Handler(Ignore), installHandler, openEndedPipe) #endif --- | wrapper around 'logM' for this module +-- | wrapper around 'logM' for this module log':: Priority -> String -> IO () log' = logM "Happstack.Server.Internal.TLS" @@ -45,7 +45,7 @@  -- | a partially complete 'TLSConf' . You must sete 'tlsCert' and 'tlsKey' at a mininum. nullTLSConf :: TLSConf-nullTLSConf = +nullTLSConf =     TLSConf { tlsPort      = 443             , tlsCert      = ""             , tlsKey       = ""@@ -53,8 +53,8 @@             , tlsLogAccess = Just logMAccess             , tlsValidator = Nothing             }-               + -- | record that holds the 'Socket' and 'SSLContext' needed to start -- the https:\/\/ event loop. Used with 'simpleHTTPWithSocket'' --@@ -174,12 +174,12 @@            ehs :: SomeException -> IO ()            ehs x = when ((fromException x) /= Just ThreadKilled) $ log' ERROR ("HTTPS request failed with: " ++ show x) -           catchSome op h = +           catchSome op h =                op `E.catches` [ Handler $ ignoreSSLException                               , Handler $ \(e :: ArithException) -> h (toException e)                               , Handler $ \(e :: ArrayException) -> h (toException e)                               , Handler $ \(e :: IOException)    ->-                                  if isFullError e || isDoesNotExistError e+                                  if isFullError e || isDoesNotExistError e || isResourceVanishedError e                                   then return () -- h (toException e) -- we could log the exception, but there could be thousands of them                                   else throw e                               ]