haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support for http-reverse-proxy 0.6.0

Browse Source
This commit is contained in:
Michael Snoyman 2018-04-26 11:20:04 +03:00
parent 06e0ffb48b
commit e87c9b5bf0
No known key found for this signature in database
GPG Key ID: A048E8C057E86876
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yesod-bin/ChangeLog.md
View File

@ -1,3 +1,7 @@
## 1.6.0.1
* Support for http-reverse-proxy 0.6
## 1.6.0 ## 1.6.0
* Upgrade to conduit 1.3.0 * Upgrade to conduit 1.3.0

6
yesod-bin/Devel.hs
View File

@ -18,7 +18,6 @@ import Control.Monad (forever, unless, void,
import Data.ByteString (ByteString, isInfixOf) import Data.ByteString (ByteString, isInfixOf)
import qualified Data.ByteString.Lazy as LB import qualified Data.ByteString.Lazy as LB
import Conduit import Conduit
import Data.Default.Class (def)
import Data.FileEmbed (embedFile) import Data.FileEmbed (embedFile)
import qualified Data.Map as Map import qualified Data.Map as Map
import Data.Maybe (isJust) import Data.Maybe (isJust)
@ -38,7 +37,8 @@ import Network.HTTP.Client (managerSetProxy,
import Network.HTTP.Client.TLS (tlsManagerSettings) import Network.HTTP.Client.TLS (tlsManagerSettings)
import Network.HTTP.ReverseProxy (ProxyDest (ProxyDest), import Network.HTTP.ReverseProxy (ProxyDest (ProxyDest),
waiProxyToSettings, waiProxyToSettings,
wpsOnExc, wpsTimeout) wpsOnExc, wpsTimeout,
defaultWaiProxySettings)
import qualified Network.HTTP.ReverseProxy as ReverseProxy import qualified Network.HTTP.ReverseProxy as ReverseProxy
import Network.HTTP.Types (status200, status503) import Network.HTTP.Types (status200, status503)
import qualified Network.Socket import qualified Network.Socket
@ -147,7 +147,7 @@ reverseProxy opts appPortVar = do
return $ return $
ReverseProxy.WPRProxyDest ReverseProxy.WPRProxyDest
$ ProxyDest "127.0.0.1" appPort) $ ProxyDest "127.0.0.1" appPort)
def defaultWaiProxySettings
{ wpsOnExc = \e req f -> onExc e req >>= f { wpsOnExc = \e req f -> onExc e req >>= f
, wpsTimeout = , wpsTimeout =
if proxyTimeout opts == 0 if proxyTimeout opts == 0

2
yesod-bin/yesod-bin.cabal
View File

@ -1,5 +1,5 @@
name: yesod-bin name: yesod-bin
version: 1.6.0 version: 1.6.0.1
license: MIT license: MIT
license-file: LICENSE license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com> author: Michael Snoyman <michael@snoyman.com>