yesod-bin 1.4.3.10 → 1.4.3.11

raw patch · 3 files changed

+13/−1 lines, 3 filesdep +http-client

Dependencies added: http-client

Files

• ChangeLog.md +4/−0
• Devel.hs +7/−0
• yesod-bin.cabal +2/−1

@@ -1,3 +1,7 @@+## 1.4.3.11++* Disregard proxy environment variables in yesod devel [#945](https://github.com/yesodweb/yesod/pull/945)+ ## 1.4.3.10  * Allow blaze-builder 0.4

@@ -68,6 +68,9 @@ 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@@ -124,7 +127,11 @@ -- 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)

@@ -1,5 +1,5 @@ name:            yesod-bin-version:         1.4.3.10+version:         1.4.3.11 license:         MIT license-file:    LICENSE author:          Michael Snoyman <michael@snoyman.com>@@ -78,6 +78,7 @@                      , http-reverse-proxy >= 0.4                      , network                      , http-conduit       >= 2.1.4+                     , http-client                      , project-template   >= 0.1.1                      , transformers                      , transformers-compat