From 761e7dd3745e2fb0e8db425fecdceadccee5d99d Mon Sep 17 00:00:00 2001 From: Paul Rouse Date: Sat, 28 Feb 2015 21:38:11 +0000 Subject: [PATCH 1/3] Disregard proxy environment variables in yesod devel --- yesod-bin/Devel.hs | 3 ++- yesod-bin/yesod-bin.cabal | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/yesod-bin/Devel.hs b/yesod-bin/Devel.hs index 8912dbaa..043648eb 100644 --- a/yesod-bin/Devel.hs +++ b/yesod-bin/Devel.hs @@ -68,6 +68,7 @@ import Data.Streaming.Network (bindPortTCP) import Network (withSocketsDo) import Network.HTTP.Conduit (conduitManagerSettings, newManager) import Data.Default.Class (def) +import Network.HTTP.Client (managerSetProxy, noProxy) import Network.HTTP.ReverseProxy (ProxyDest (ProxyDest), waiProxyToSettings, wpsTimeout, wpsOnExc) 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. reverseProxy :: DevelOpts -> I.IORef Int -> IO () reverseProxy opts iappPort = do - manager <- newManager conduitManagerSettings + manager <- newManager $ managerSetProxy noProxy conduitManagerSettings let refreshHtml = LB.fromChunks $ return $(embedFile "refreshing.html") let onExc _ req | maybe False (("application/json" `elem`) . parseHttpAccept) diff --git a/yesod-bin/yesod-bin.cabal b/yesod-bin/yesod-bin.cabal index 01ac8569..2785a5a9 100644 --- a/yesod-bin/yesod-bin.cabal +++ b/yesod-bin/yesod-bin.cabal @@ -78,6 +78,7 @@ executable yesod , http-reverse-proxy >= 0.4 , network , http-conduit >= 2.1.4 + , http-client , project-template >= 0.1.1 , transformers , transformers-compat From e69ea760e186a85daab9b061fdd917dda69e7398 Mon Sep 17 00:00:00 2001 From: Paul Rouse Date: Sun, 1 Mar 2015 08:17:20 +0000 Subject: [PATCH 2/3] Version bound on http-client --- yesod-bin/yesod-bin.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yesod-bin/yesod-bin.cabal b/yesod-bin/yesod-bin.cabal index 2785a5a9..fa745bf9 100644 --- a/yesod-bin/yesod-bin.cabal +++ b/yesod-bin/yesod-bin.cabal @@ -78,7 +78,7 @@ executable yesod , http-reverse-proxy >= 0.4 , network , http-conduit >= 2.1.4 - , http-client + , http-client >= 0.4.7 , project-template >= 0.1.1 , transformers , transformers-compat From 5281d7aa3e5b7185020bc0aacb4023ce84d55b1b Mon Sep 17 00:00:00 2001 From: Paul Rouse Date: Sun, 1 Mar 2015 11:20:19 +0000 Subject: [PATCH 3/3] Remain compatible with pre-0.4.7 http-client --- yesod-bin/Devel.hs | 6 ++++++ yesod-bin/yesod-bin.cabal | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/yesod-bin/Devel.hs b/yesod-bin/Devel.hs index 043648eb..cb4d0ce1 100644 --- a/yesod-bin/Devel.hs +++ b/yesod-bin/Devel.hs @@ -68,7 +68,9 @@ import Data.Streaming.Network (bindPortTCP) import Network (withSocketsDo) import Network.HTTP.Conduit (conduitManagerSettings, newManager) import Data.Default.Class (def) +#if MIN_VERSION_http_client(0,4,7) import Network.HTTP.Client (managerSetProxy, noProxy) +#endif import Network.HTTP.ReverseProxy (ProxyDest (ProxyDest), waiProxyToSettings, wpsTimeout, wpsOnExc) import qualified Network.HTTP.ReverseProxy as ReverseProxy @@ -125,7 +127,11 @@ cabalProgram opts | isCabalDev opts = "cabal-dev" -- 3001, give an appropriate message to the user. reverseProxy :: DevelOpts -> I.IORef Int -> IO () reverseProxy opts iappPort = do +#if MIN_VERSION_http_client(0,4,7) manager <- newManager $ managerSetProxy noProxy conduitManagerSettings +#else + manager <- newManager conduitManagerSettings +#endif let refreshHtml = LB.fromChunks $ return $(embedFile "refreshing.html") let onExc _ req | maybe False (("application/json" `elem`) . parseHttpAccept) diff --git a/yesod-bin/yesod-bin.cabal b/yesod-bin/yesod-bin.cabal index fa745bf9..2785a5a9 100644 --- a/yesod-bin/yesod-bin.cabal +++ b/yesod-bin/yesod-bin.cabal @@ -78,7 +78,7 @@ executable yesod , http-reverse-proxy >= 0.4 , network , http-conduit >= 2.1.4 - , http-client >= 0.4.7 + , http-client , project-template >= 0.1.1 , transformers , transformers-compat