http-enumerator 0.2.0.4 → 0.2.1

raw patch · 3 files changed

+15/−14 lines, 3 filesdep ~blaze-builderdep ~mtldep ~tlsPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: blaze-builder, mtl, tls

API changes (from Hackage documentation)

Files

• Network/HTTP/Enumerator.hs +9/−9
• Network/TLS/Client/Enumerator.hs +2/−1
• http-enumerator.cabal +4/−4

@@ -104,7 +104,7 @@ import Data.Maybe (fromMaybe) import Data.ByteString.Lazy.Internal (defaultChunkSize) import Codec.Binary.UTF8.String (encodeString)-import qualified Text.Blaze.Builder.Core as Blaze+import qualified Blaze.ByteString.Builder as Blaze import Data.Monoid (Monoid (..))  -- | The OpenSSL library requires some initialization of variables to be used,@@ -577,18 +577,18 @@     body = Blaze.toLazyByteString $ body' headers     body' [] = mempty     body' [x] = pair x-    body' (x:xs) = pair x `mappend` Blaze.singleton 38 `mappend` body' xs+    body' (x:xs) = pair x `mappend` Blaze.fromWord8 38 `mappend` body' xs     pair (x, y)         | S.null y = single x         | otherwise =-            single x `mappend` Blaze.singleton 61 `mappend` single y-    single = Blaze.writeList go . S.unpack-    go 32 = Blaze.writeByte 43 -- space to plus-    go c | unreserved c = Blaze.writeByte c+            single x `mappend` Blaze.fromWord8 61 `mappend` single y+    single = Blaze.fromWrite4List go . S.unpack+    go 32 = Blaze.writeWord8 43 -- space to plus+    go c | unreserved c = Blaze.writeWord8 c     go c =         let x = shiftR c 4             y = c .&. 15-         in Blaze.writeByte 37 `mappend` hexChar x `mappend` hexChar y+         in Blaze.writeWord8 37 `mappend` hexChar x `mappend` hexChar y     unreserved  45 = True -- hyphen     unreserved  46 = True -- period     unreserved  95 = True -- underscore@@ -599,8 +599,8 @@         | 97 <= c && c <= 122 = True -- A - Z     unreserved _ = False     hexChar c-        | c < 10 = Blaze.writeByte $ c + 48-        | c < 16 = Blaze.writeByte $ c + 55+        | c < 10 = Blaze.writeWord8 $ c + 48+        | c < 16 = Blaze.writeWord8 $ c + 55         | otherwise = error $ "hexChar: " ++ show c  catchParser :: Monad m => String -> Iteratee a m b -> Iteratee a m b

@@ -41,7 +41,8 @@                 { cbCertificates = Nothing                 }             }-    srand <- Trans.liftIO makeSRandomGen+    esrand <- Trans.liftIO makeSRandomGen+    let srand = either (error . show) id esrand     clientEnum clientstate srand h f   where     ciphers =

@@ -1,5 +1,5 @@ name:            http-enumerator-version:         0.2.0.4+version:         0.2.1 license:         BSD3 license-file:    LICENSE author:          Michael Snoyman <michael@snoyman.com>@@ -31,14 +31,14 @@                  , attoparsec            >= 0.8.0.2 && < 0.9                  , attoparsec-enumerator >= 0.2     && < 0.3                  , utf8-string           >= 0.3.4   && < 0.4-                 , blaze-builder         >= 0.1     && < 0.2+                 , blaze-builder         >= 0.2     && < 0.3                  , zlib-bindings         >= 0.0.0   && < 0.1     if flag(openssl)         build-depends: HsOpenSSL         >= 0.8     && < 0.9         cpp-options:   -DOPENSSL     else-        build-depends: tls               >= 0.2     && < 0.3-                     , mtl               >= 1.1     && < 1.2+        build-depends: tls               >= 0.3     && < 0.4+                     , mtl               >= 1.1     && < 2.1     exposed-modules: Network.HTTP.Enumerator     other-modules:   Network.HTTP.Enumerator.HttpParser                      Network.HTTP.Enumerator.Zlib