om-http 0.5.0.1 → 0.6.0.0

raw patch · 2 files changed

+18/−9 lines, 2 files

Files

• om-http.cabal +1/−1
• src/OM/HTTP.hs +17/−8

@@ -1,6 +1,6 @@ cabal-version:       3.0 name:                om-http-version:             0.5.0.1+version:             0.6.0.0 synopsis:            Http utilities. description:         Random HTTP utilities. homepage:            https://github.com/owensmurray/om-http

@@ -66,7 +66,9 @@   , Application, Middleware, Response, ResponseReceived, mapResponseHeaders   , responseHeaders, responseLBS, responseRaw, responseStatus   )-import Network.Wai.Handler.Warp (run)+import Network.Wai.Handler.Warp+  ( HostPreference, Settings, defaultSettings, runSettings, setHost, setPort+  ) import OM.Show (showt) import Prelude   ( Applicative(pure), Either(Left, Right), Eq((/=), (==))@@ -95,17 +97,24 @@ -} runTlsRedirect   :: (Loc -> LogSource -> LogLevel -> LogStr -> IO ()) {- ^ Logging backend. -}+  -> HostPreference   -> ByteString {- ^ Server name. -}   -> Version {- ^ Server version. -}   -> ByteString {- ^ Target URL. -}   -> IO ()-runTlsRedirect logging serverName serverVersion url =-  run 80-    . requestLogging logging mempty-    . setServer serverName serverVersion-    . hstsDirective 600-    . logExceptionsAndContinue logging-    $ tlsRedirect url+runTlsRedirect logging host serverName serverVersion url =+    runSettings settings+      . requestLogging logging mempty+      . setServer serverName serverVersion+      . hstsDirective 600+      . logExceptionsAndContinue logging+      $ tlsRedirect url+  where+    settings :: Settings+    settings =+      setPort 80+      . setHost host+      $ defaultSettings   {- |