From e87c9b5bf0d91708db700d49bcfa457e4a68583c Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 26 Apr 2018 11:20:04 +0300 Subject: [PATCH] Support for http-reverse-proxy 0.6.0 --- yesod-bin/ChangeLog.md | 4 ++++ yesod-bin/Devel.hs | 6 +++--- yesod-bin/yesod-bin.cabal | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/yesod-bin/ChangeLog.md b/yesod-bin/ChangeLog.md index 04daaf82..08163933 100644 --- a/yesod-bin/ChangeLog.md +++ b/yesod-bin/ChangeLog.md @@ -1,3 +1,7 @@ +## 1.6.0.1 + +* Support for http-reverse-proxy 0.6 + ## 1.6.0 * Upgrade to conduit 1.3.0 diff --git a/yesod-bin/Devel.hs b/yesod-bin/Devel.hs index 4daa9cca..2bd054fb 100644 --- a/yesod-bin/Devel.hs +++ b/yesod-bin/Devel.hs @@ -18,7 +18,6 @@ import Control.Monad (forever, unless, void, import Data.ByteString (ByteString, isInfixOf) import qualified Data.ByteString.Lazy as LB import Conduit -import Data.Default.Class (def) import Data.FileEmbed (embedFile) import qualified Data.Map as Map import Data.Maybe (isJust) @@ -38,7 +37,8 @@ import Network.HTTP.Client (managerSetProxy, import Network.HTTP.Client.TLS (tlsManagerSettings) import Network.HTTP.ReverseProxy (ProxyDest (ProxyDest), waiProxyToSettings, - wpsOnExc, wpsTimeout) + wpsOnExc, wpsTimeout, + defaultWaiProxySettings) import qualified Network.HTTP.ReverseProxy as ReverseProxy import Network.HTTP.Types (status200, status503) import qualified Network.Socket @@ -147,7 +147,7 @@ reverseProxy opts appPortVar = do return $ ReverseProxy.WPRProxyDest $ ProxyDest "127.0.0.1" appPort) - def + defaultWaiProxySettings { wpsOnExc = \e req f -> onExc e req >>= f , wpsTimeout = if proxyTimeout opts == 0 diff --git a/yesod-bin/yesod-bin.cabal b/yesod-bin/yesod-bin.cabal index 7bf30c43..af065351 100644 --- a/yesod-bin/yesod-bin.cabal +++ b/yesod-bin/yesod-bin.cabal @@ -1,5 +1,5 @@ name: yesod-bin -version: 1.6.0 +version: 1.6.0.1 license: MIT license-file: LICENSE author: Michael Snoyman