From bc4ecd7dc838ccb2a4bf59c664580b7d528191b2 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 26 Apr 2018 12:17:00 +0300 Subject: [PATCH] Fix broken http-reverse-proxy < 0.6 support --- yesod-bin/ChangeLog.md | 4 ++++ yesod-bin/Devel.hs | 11 ++++++++++- yesod-bin/yesod-bin.cabal | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/yesod-bin/ChangeLog.md b/yesod-bin/ChangeLog.md index 08163933..7017152a 100644 --- a/yesod-bin/ChangeLog.md +++ b/yesod-bin/ChangeLog.md @@ -1,3 +1,7 @@ +## 1.6.0.2 + +* Fix broken support for older http-reverse-proxy + ## 1.6.0.1 * Support for http-reverse-proxy 0.6 diff --git a/yesod-bin/Devel.hs b/yesod-bin/Devel.hs index 2bd054fb..1928b9c0 100644 --- a/yesod-bin/Devel.hs +++ b/yesod-bin/Devel.hs @@ -38,7 +38,12 @@ import Network.HTTP.Client.TLS (tlsManagerSettings) import Network.HTTP.ReverseProxy (ProxyDest (ProxyDest), waiProxyToSettings, wpsOnExc, wpsTimeout, - defaultWaiProxySettings) +#if MIN_VERSION_http_reverse_proxy(0, 6, 0) + defaultWaiProxySettings +#else + def +#endif + ) import qualified Network.HTTP.ReverseProxy as ReverseProxy import Network.HTTP.Types (status200, status503) import qualified Network.Socket @@ -147,7 +152,11 @@ reverseProxy opts appPortVar = do return $ ReverseProxy.WPRProxyDest $ ProxyDest "127.0.0.1" appPort) +#if MIN_VERSION_http_reverse_proxy(0, 6, 0) defaultWaiProxySettings +#else + def +#endif { 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 af065351..8eed9040 100644 --- a/yesod-bin/yesod-bin.cabal +++ b/yesod-bin/yesod-bin.cabal @@ -1,5 +1,5 @@ name: yesod-bin -version: 1.6.0.1 +version: 1.6.0.2 license: MIT license-file: LICENSE author: Michael Snoyman