HTTP 4000.3.10 → 4000.3.11

raw patch · 2 files changed

+9/−9 lines, 2 filesdep ~Win32dep ~conduitdep ~conduit-extraPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: Win32, conduit, conduit-extra, time

API changes (from Hackage documentation)

Files

• HTTP.cabal +5/−9
• Network/HTTP/Proxy.hs +4/−0

@@ -1,5 +1,5 @@ Name: HTTP-Version: 4000.3.10+Version: 4000.3.11 Cabal-Version: >= 1.8 Build-type: Simple License: BSD3@@ -69,10 +69,6 @@   description: Build with warnings-as-errors   manual:      True -Flag network23-  description: Use version 2.3.x or below of the network package-  default: False- Flag conduit10   description: Use version 1.0.x or below of the conduit package (for the test suite)   default: False@@ -113,7 +109,7 @@   -- where dependencies are shared   Build-depends: base >= 4.3.0.0 && < 4.12, parsec >= 2.0 && < 3.2   Build-depends: array >= 0.3.0.2 && < 0.6, bytestring >= 0.9.1.5 && < 0.11-  Build-depends: time >= 1.1.2.3 && < 1.9+  Build-depends: time >= 1.1.2.3 && < 1.10    Extensions: FlexibleInstances @@ -132,7 +128,7 @@     ghc-options:      -Werror    if os(windows)-    Build-depends: Win32 >= 2.2.0.0 && < 2.6+    Build-depends: Win32 >= 2.2.0.0 && < 2.7  Test-Suite test   type: exitcode-stdio-1.0@@ -176,7 +172,7 @@                          conduit >= 1.0.8 && < 1.1     else       build-depends:-                         conduit >= 1.1 && < 1.3,-                         conduit-extra >= 1.1 && < 1.3+                         conduit >= 1.1 && < 1.4,+                         conduit-extra >= 1.1 && < 1.4  

@@ -103,7 +103,11 @@   (bracket (uncurry regOpenKey registryProxyLoc) regCloseKey $ \hkey -> do     enable <- fmap toBool $ regQueryValueDWORD hkey "ProxyEnable"     if enable+#if MIN_VERSION_Win32(2,6,0)+        then fmap Just $ regQueryValue hkey "ProxyServer"+#else         then fmap Just $ regQueryValue hkey (Just "ProxyServer")+#endif         else return Nothing)   (\_ -> return Nothing)