HTTP 4000.1.0 → 4000.1.1

raw patch · 3 files changed

+14/−5 lines, 3 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• HTTP.cabal +1/−1
• Network/BufferType.hs +8/−4
• Network/HTTP/Utils.hs +5/−0

@@ -1,5 +1,5 @@ Name: HTTP-Version: 4000.1.0+Version: 4000.1.1 Cabal-Version: >= 1.2 Build-type: Simple License: BSD3

@@ -38,7 +38,7 @@ import System.IO ( Handle ) import Data.Word ( Word8 ) -import Network.HTTP.Utils ( crlf )+import Network.HTTP.Utils ( crlf, lf )  -- | The @BufferType@ class encodes, in a mixed-mode way, the interface -- that the library requires to operate over data embedded in HTTP@@ -106,11 +106,13 @@       , buf_splitAt      = Strict.splitAt       , buf_span         = Strict.span       , buf_empty        = Strict.empty-      , buf_isLineTerm   = \ b -> Strict.length b == 2 && p_crlf == b+      , buf_isLineTerm   = \ b -> Strict.length b == 2 && p_crlf == b ||+                                  Strict.length b == 1 && p_lf   == b       , buf_isEmpty      = Strict.null        }    where     p_crlf = Strict.pack crlf+    p_lf   = Strict.pack lf  -- | @lazyBufferOp@ is the 'BufferOp' definition over @ByteString@s, -- the non-strict kind.@@ -129,11 +131,13 @@       , buf_splitAt      = \ i x -> Lazy.splitAt (fromIntegral i) x       , buf_span         = Lazy.span       , buf_empty        = Lazy.empty-      , buf_isLineTerm   = \ b -> Lazy.length b == 2 && p_crlf == b+      , buf_isLineTerm   = \ b -> Lazy.length b == 2 && p_crlf == b ||+                                  Lazy.length b == 1 && p_lf   == b       , buf_isEmpty      = Lazy.null        }    where     p_crlf = Lazy.pack crlf+    p_lf   = Lazy.pack lf  -- | @stringBufferOp@ is the 'BufferOp' definition over @String@s. -- It is defined in terms of @strictBufferOp@ operations,@@ -154,7 +158,7 @@                              case Strict.span p (Strict.pack a) of 			       (x,y) -> (Strict.unpack x, Strict.unpack y)       , buf_empty        = []-      , buf_isLineTerm   = \ b -> b == crlf+      , buf_isLineTerm   = \ b -> b == crlf || b == lf       , buf_isEmpty      = null        } 

@@ -16,6 +16,7 @@        , trimR    -- :: String -> String                , crlf     -- :: String+       , lf       -- :: String        , sp       -- :: String         , split    -- :: Eq a => a -> [a] -> Maybe ([a],[a])@@ -35,6 +36,10 @@ -- | @crlf@ is our beloved two-char line terminator. crlf :: String crlf = "\r\n"++-- | @lf@ is a tolerated line terminator, per RFC 2616 section 19.3.+lf :: String+lf = "\n"  -- | @sp@ lets you save typing one character. sp :: String