HTTP 4000.2.5 → 4000.2.6

raw patch · 3 files changed

+12/−15 lines, 3 filesdep ~networknew-uploaderPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: network

API changes (from Hackage documentation)

Files

HTTP.cabal +6/−9
Network/Browser.hs +3/−3
Network/HTTP/Auth.hs +3/−3

HTTP.cabal view

@@ -1,5 +1,5 @@ Name: HTTP-Version: 4000.2.5+Version: 4000.2.6 Cabal-Version: >= 1.8 Build-type: Simple License: BSD3@@ -85,22 +85,18 @@                  Network.HTTP.Utils                  Paths_HTTP   GHC-options: -fwarn-missing-signatures -Wall-  Build-depends: base >= 2 && < 4.7, parsec+  Build-depends: base >= 2 && < 4.7, network < 2.5, parsec   Extensions: FlexibleInstances   if flag(old-base)     Build-depends: base < 3   else     Build-depends: base >= 3, array, old-time, bytestring+   if flag(mtl1)     Build-depends: mtl >= 1.1 && < 1.2     CPP-Options: -DMTL1   else     Build-depends: mtl >= 2.0 && < 2.2-  if flag(network23)-    Build-depends: network < 2.4-    CPP-Options: -DNETWORK23-  else-    Build-depends: network >= 2.4 && < 2.5    if flag(warn-as-error)     ghc-options:      -Werror@@ -111,11 +107,12 @@ Test-Suite test   type: exitcode-stdio-1.0 -  build-tools: ghc >= 6.10 && < 7.6+  build-tools: ghc >= 6.10    hs-source-dirs: test   main-is: httpTests.hs +  -- note: version constraints are inherited from HTTP library stanza   build-depends:     HTTP,                      HUnit,                      httpd-shed,@@ -129,7 +126,7 @@                      warp >= 1.2 && < 1.3,                      pureMD5 >= 2.1 && < 2.2,                      base >= 2 && < 4.6,-                     network < 2.5,+                     network,                      split >= 0.1 && < 0.2,                      test-framework,                      test-framework-hunit

Network/Browser.hs view

@@ -1035,10 +1035,10 @@ -- If the second argument is not sufficient context for determining -- a full URI then anarchy reins. uriDefaultTo :: URI -> URI -> URI-#ifdef NETWORK23-uriDefaultTo a b = maybe a id (a `relativeTo` b)-#else+#if MIN_VERSION_network(2,4,0) uriDefaultTo a b = a `relativeTo` b+#else+uriDefaultTo a b = maybe a id (a `relativeTo` b) #endif

Network/HTTP/Auth.hs view

@@ -190,10 +190,10 @@                }          annotateURIs :: [Maybe URI] -> [URI]-#ifdef NETWORK23-        annotateURIs = (map (\u -> fromMaybe u (u `relativeTo` baseURI))) . catMaybes-#else+#if MIN_VERSION_network(2,4,0)         annotateURIs = map (`relativeTo` baseURI) . catMaybes+#else+        annotateURIs = (map (\u -> fromMaybe u (u `relativeTo` baseURI))) . catMaybes #endif          -- Change These: