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

Disregard proxy environment variables in yesod devel

Browse Source
This commit is contained in:
Paul Rouse 2015-02-28 21:38:11 +00:00
parent c7b4f1ddbe
commit 761e7dd374
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
yesod-bin/Devel.hs
View File

@ -68,6 +68,7 @@ import Data.Streaming.Network (bindPortTCP)
import Network (withSocketsDo) import Network (withSocketsDo)
import Network.HTTP.Conduit (conduitManagerSettings, newManager) import Network.HTTP.Conduit (conduitManagerSettings, newManager)
import Data.Default.Class (def) import Data.Default.Class (def)
import Network.HTTP.Client (managerSetProxy, noProxy)
import Network.HTTP.ReverseProxy (ProxyDest (ProxyDest), import Network.HTTP.ReverseProxy (ProxyDest (ProxyDest),
waiProxyToSettings, wpsTimeout, wpsOnExc) waiProxyToSettings, wpsTimeout, wpsOnExc)
import qualified Network.HTTP.ReverseProxy as ReverseProxy import qualified Network.HTTP.ReverseProxy as ReverseProxy
@ -124,7 +125,7 @@ cabalProgram opts | isCabalDev opts = "cabal-dev"
-- 3001, give an appropriate message to the user. -- 3001, give an appropriate message to the user.
reverseProxy :: DevelOpts -> I.IORef Int -> IO () reverseProxy :: DevelOpts -> I.IORef Int -> IO ()
reverseProxy opts iappPort = do reverseProxy opts iappPort = do
manager <- newManager conduitManagerSettings manager <- newManager $ managerSetProxy noProxy conduitManagerSettings
let refreshHtml = LB.fromChunks $ return $(embedFile "refreshing.html") let refreshHtml = LB.fromChunks $ return $(embedFile "refreshing.html")
let onExc _ req let onExc _ req
| maybe False (("application/json" `elem`) . parseHttpAccept) | maybe False (("application/json" `elem`) . parseHttpAccept)

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

@ -78,6 +78,7 @@ executable yesod
, http-reverse-proxy >= 0.4 , http-reverse-proxy >= 0.4
, network , network
, http-conduit >= 2.1.4 , http-conduit >= 2.1.4
, http-client
, project-template >= 0.1.1 , project-template >= 0.1.1
, transformers , transformers
, transformers-compat , transformers-compat