on master help sign in
fixup: use _cr and _lf from Data.Word8
commitf962cea1442ccc6cfa7b612022ddd6417d89a7ca authorSönke Hahn <soenkehahn@gmail.com> dateFri 18 Sep 2015, 00:04 (11 years ago) parentc478cbc
1 file changed+3−10
warp/Network/Wai/Handler/Warp/Response.hs+3−10
warp/Network/Wai/Handler/Warp/Response.hs+3−10
@@ -34,7 +34,6 @@ import Data.ByteString.Builder (byteString, Builder)
3434import Data.ByteString.Builder.Extra (flush)
3535import qualified Data.ByteString.Char8 as B (pack)
3636import qualified Data.CaseInsensitive as CI
37−import Data.Char
3837import Data.Function (on)
3938import Data.List (deleteBy)
4039import Data.Maybe
@@ -48,7 +47,7 @@ import Data.Monoid (mappend, mempty)
4847#endif
4948import Data.Streaming.Blaze (newBlazeRecv, reuseBufferStrategy)
5049import Data.Version (showVersion)
51−import Data.Word
50+import Data.Word8 (_cr, _lf)
5251import qualified Network.HTTP.Types as H
5352import Network.Wai
5453import Network.Wai.Handler.Warp.Buffer (toBuilderBuffer)
@@ -189,24 +188,18 @@ sanitizeHeaders = mapResponseHeaders (map (fmap sanitizeHeaderValue))
189188
190189sanitizeHeaderValue :: ByteString -> ByteString
191190sanitizeHeaderValue v
192− | containsNewlines v = case S8.lines $ S.filter (/= cr) v of
191+ | containsNewlines v = case S8.lines $ S.filter (/= _cr) v of
193192 x : xs -> S.intercalate "\r\n" (x : mapMaybe addSpaceIfMissing xs)
194193 [] -> ""
195194 | otherwise = v
196195 where
197− containsNewlines = S.any (\w -> w == cr || w == lf)
196+ containsNewlines = S.any (\w -> w == _cr || w == _lf)
198197 addSpaceIfMissing line = case S8.uncons line of
199198 Nothing -> Nothing
200199 Just (first, _) -> Just $ if first == ' ' || first == '\t'
201200 then line
202201 else " " <> line
203202
204−cr :: Word8
205−cr = fromIntegral (ord '\r')
206−
207−lf :: Word8
208−lf = fromIntegral (ord '\n')
209−
210203data Rsp = RspFile FilePath (Maybe FilePart) (Maybe HeaderValue) Bool (IO ())
211204 | RspBuilder Builder Bool
212205 | RspStream StreamingBody Bool T.Handle