3b97139 · typeable/wai

git.iko.soy/typeable/wai

refactoring for Data.Bytestring.Char8.

commit3b971391610179b2354544837d5949a3a7401994 authorKazu Yamamoto <kazu@iij.ad.jp> dateWed 22 Nov 2017, 12:07 (9 years ago) parent59a1f87

8 files changed+19−19

compare with master

unifiedsplit

warp/Network/Wai/Handler/Warp/Date.hs+1−1 warp/Network/Wai/Handler/Warp/File.hs+2−2 warp/Network/Wai/Handler/Warp/HTTP2/File.hs+2−2 warp/Network/Wai/Handler/Warp/HTTP2/Request.hs+2−2 warp/Network/Wai/Handler/Warp/PackInt.hs+3−3 warp/Network/Wai/Handler/Warp/RequestHeader.hs+2−2 warp/Network/Wai/Handler/Warp/Response.hs+4−4 warp/Network/Wai/Handler/Warp/Settings.hs+3−3

warp/Network/Wai/Handler/Warp/Date.hs+1−1

@@ -6,7 +6,7 @@ module Network.Wai.Handler.Warp.Date (

66 ) where

88import Control.AutoUpdate (defaultUpdateSettings, updateAction, mkAutoUpdate)

9−import Data.ByteString.Char8

9+import Data.ByteString

1010import Network.HTTP.Date

1111

1212#if WINDOWS

warp/Network/Wai/Handler/Warp/File.hs+2−2

@@ -11,7 +11,7 @@ module Network.Wai.Handler.Warp.File (

1111

1212import Control.Applicative ((<|>))

1313import Data.Array ((!))

14−import qualified Data.ByteString.Char8 as B (pack)

14+import qualified Data.ByteString.Char8 as C8 (pack)

1515import Data.ByteString (ByteString)

1616import Data.Maybe (fromMaybe)

1717import Network.HTTP.Date

@@ -117,7 +117,7 @@ checkRange (H.ByteRangeSuffix count) size = (max 0 (size - count), size - 1)

117117contentRangeHeader :: Integer -> Integer -> Integer -> H.Header

118118contentRangeHeader beg end total = (H.hContentRange, range)

119119 where

120− range = B.pack

120+ range = C8.pack

121121 -- building with ShowS

122122 $ 'b' : 'y': 't' : 'e' : 's' : ' '

123123 : (if beg > end then ('*':) else

warp/Network/Wai/Handler/Warp/HTTP2/File.hs+2−2

@@ -10,7 +10,7 @@ module Network.Wai.Handler.Warp.HTTP2.File (

1010 ) where

1111

1212import Control.Applicative ((<|>))

13−import qualified Data.ByteString.Char8 as B (pack)

13+import qualified Data.ByteString.Char8 as C8 (pack)

1414import Data.ByteString (ByteString)

1515import Data.Maybe (fromMaybe)

1616import Network.HTTP.Date

@@ -124,7 +124,7 @@ checkRange (H.ByteRangeSuffix count) size = (max 0 (size - count), size - 1)

124124contentRangeHeader :: Integer -> Integer -> Integer -> TokenHeader

125125contentRangeHeader beg end total = (tokenContentRange, range)

126126 where

127− range = B.pack

127+ range = C8.pack

128128 -- building with ShowS

129129 $ 'b' : 'y': 't' : 'e' : 's' : ' '

130130 : (if beg > end then ('*':) else

warp/Network/Wai/Handler/Warp/HTTP2/Request.hs+2−2

@@ -12,7 +12,7 @@ module Network.Wai.Handler.Warp.HTTP2.Request (

1212import Control.Applicative ((<|>))

1313import Control.Arrow (first)

1414import Data.ByteString (ByteString)

15−import qualified Data.ByteString.Char8 as B8

15+import qualified Data.ByteString.Char8 as C8

1616import Data.IORef

1717import Data.Maybe (fromJust)

1818import qualified Data.Vault.Lazy as Vault

@@ -76,7 +76,7 @@ mkRequest' ii1 settings addr ref (reqths,reqvt) (bodylen,body) = return (req,ii)

7676 !mUserAgent = getHeaderValue tokenUserAgent reqvt

7777 -- CONNECT request will have ":path" omitted, use ":authority" as unparsed

7878 -- path instead so that it will have consistent behavior compare to HTTP 1.0

79− (unparsedPath,query) = B8.break (=='?') $ fromJust (mPath <|> mAuth)

79+ (unparsedPath,query) = C8.break (=='?') $ fromJust (mPath <|> mAuth)

8080 !path = H.extractPath unparsedPath

8181 !rawPath = if S.settingsNoParsePath settings then unparsedPath else path

8282 !h = hashByteString rawPath

warp/Network/Wai/Handler/Warp/PackInt.hs+3−3

@@ -10,13 +10,13 @@ import Foreign.Storable (poke)

1010import qualified Network.HTTP.Types as H

1111

1212-- $setup

13−-- >>> import Data.ByteString.Char8 as B

13+-- >>> import Data.ByteString.Char8 as C8

1414-- >>> import Test.QuickCheck (Large(..))

1515

1616-- |

1717--

18−-- prop> packIntegral (abs n) == B.pack (show (abs n))

19−-- prop> \(Large n) -> let n' = fromIntegral (abs n :: Int) in packIntegral n' == B.pack (show n')

18+-- prop> packIntegral (abs n) == C8.pack (show (abs n))

19+-- prop> \(Large n) -> let n' = fromIntegral (abs n :: Int) in packIntegral n' == C8.pack (show n')

2020

2121packIntegral :: Integral a => a -> ByteString

2222packIntegral 0 = "0"

warp/Network/Wai/Handler/Warp/RequestHeader.hs+2−2

@@ -8,7 +8,7 @@ module Network.Wai.Handler.Warp.RequestHeader (

88import Control.Exception (throwIO)

99import Control.Monad (when)

1010import qualified Data.ByteString as S

11−import qualified Data.ByteString.Char8 as B (unpack)

11+import qualified Data.ByteString.Char8 as C8 (unpack)

1212import Data.ByteString.Internal (ByteString(..), memchr)

1313import qualified Data.CaseInsensitive as CI

1414import Data.Word (Word8)

@@ -89,7 +89,7 @@ parseRequestLine requestLine@(PS fptr off len) = withForeignPtr fptr $ \ptr -> d

8989

9090 return (method,path,query,hv)

9191 where

92− baderr = BadFirstLine $ B.unpack requestLine

92+ baderr = BadFirstLine $ C8.unpack requestLine

9393 check :: Ptr Word8 -> Int -> Word8 -> IO ()

9494 check p n w = do

9595 w0 <- peek $ p `plusPtr` n

warp/Network/Wai/Handler/Warp/Response.hs+4−4

@@ -20,7 +20,7 @@ import Control.Monad (unless, when)

2020import Data.Array ((!))

2121import Data.ByteString (ByteString)

2222import qualified Data.ByteString as S

23−import qualified Data.ByteString.Char8 as S8

23+import qualified Data.ByteString.Char8 as C8

2424import Data.ByteString.Builder (byteString, Builder)

2525import Data.ByteString.Builder.Extra (flush)

2626import qualified Data.CaseInsensitive as CI

@@ -175,11 +175,11 @@ containsNewlines = S.any (\w -> w == _cr || w == _lf)

175175

176176{-# INLINE sanitizeHeaderValue #-}

177177sanitizeHeaderValue :: ByteString -> ByteString

178−sanitizeHeaderValue v = case S8.lines $ S.filter (/= _cr) v of

178+sanitizeHeaderValue v = case C8.lines $ S.filter (/= _cr) v of

179179 [] -> ""

180− x : xs -> S8.intercalate "\r\n" (x : mapMaybe addSpaceIfMissing xs)

180+ x : xs -> C8.intercalate "\r\n" (x : mapMaybe addSpaceIfMissing xs)

181181 where

182− addSpaceIfMissing line = case S8.uncons line of

182+ addSpaceIfMissing line = case C8.uncons line of

183183 Nothing -> Nothing

184184 Just (first, _)

185185 | first == ' ' || first == '\t' -> Just line

warp/Network/Wai/Handler/Warp/Settings.hs+3−3

@@ -8,7 +8,7 @@ import Control.Concurrent (forkIOWithUnmask)

88import Control.Exception

99import Control.Monad (when, void)

1010import Data.ByteString (ByteString)

11−import qualified Data.ByteString.Char8 as S8

11+import qualified Data.ByteString.Char8 as C8

1212import Data.ByteString.Builder (byteString)

1313import Data.Streaming.Network (HostPreference)

1414import qualified Data.Text as T

@@ -135,7 +135,7 @@ defaultSettings = Settings

135135 , settingsFork = void . forkIOWithUnmask

136136 , settingsNoParsePath = False

137137 , settingsInstallShutdownHandler = const $ return ()

138− , settingsServerName = S8.pack $ "Warp/" ++ showVersion Paths_warp.version

138+ , settingsServerName = C8.pack $ "Warp/" ++ showVersion Paths_warp.version

139139 , settingsMaximumBodyFlush = Just 8192

140140 , settingsProxyProtocol = ProxyProtocolNone

141141 , settingsSlowlorisSize = 2048

@@ -184,4 +184,4 @@ exceptionResponseForDebug :: SomeException -> Response

184184exceptionResponseForDebug e =

185185 responseBuilder H.internalServerError500

186186 [(H.hContentType, "text/plain; charset=utf-8")]

187− $ byteString . S8.pack $ "Exception: " ++ show e

187+ $ byteString . C8.pack $ "Exception: " ++ show e