git.iko.soy/typeable/wai
on master help sign in
Clean up warnings
commit8393cf76a1dd60b78cc5045da01a3c4616c6e7fa authorMichael Snoyman <michael@snoyman.com> dateMon 15 Jan 2018, 15:00 (9 years ago) parentfd5f58c
4 files changed+58−12
compare with master
unifiedsplit
wai-extra/Network/Wai/Middleware/Gzip.hs+2−2 wai-extra/Network/Wai/Middleware/RequestLogger.hs+1−1 warp/bench/Parser.hs+9−9 warp/warp.cabal+46
wai-extra/Network/Wai/Middleware/Gzip.hs+2−2
@@ -106,8 +106,8 @@ gzip set app env sendResponse = app env $ \res ->
106106 let
107107 compressedVersion = file ++ ".gz"
108108 in
109− doesFileExist compressedVersion >>= \x ->
110− if x
109+ doesFileExist compressedVersion >>= \y ->
110+ if y
111111 then (sendResponse $ ResponseFile s (fixHeaders hs) compressedVersion Nothing)
112112 else (runAction (ResponseFile s hs file Nothing, nextAction))
113113 (ResponseFile s hs file Nothing, GzipCacheFolder cache) ->
wai-extra/Network/Wai/Middleware/RequestLogger.hs+1−1
@@ -22,7 +22,7 @@ module Network.Wai.Middleware.RequestLogger
2222import System.IO (Handle, hFlush, stdout)
2323import qualified Blaze.ByteString.Builder as B
2424import qualified Data.ByteString as BS
25−import Data.ByteString.Char8 (pack, unpack)
25+import Data.ByteString.Char8 (pack)
2626import Control.Monad (when)
2727import Control.Monad.IO.Class (liftIO)
2828import Network.Wai
warp/bench/Parser.hs+9−9
@@ -63,15 +63,15 @@ parseRequestLine3 :: ByteString
6363 ,H.HttpVersion)
6464parseRequestLine3 requestLine = ret
6565 where
66− (!method,!rest) = S.breakByte 32 requestLine -- ' '
66+ (!method,!rest) = S.break (== 32) requestLine -- ' '
6767 (!pathQuery,!httpVer')
6868 | rest == "" = throw badmsg
69− | otherwise = S.breakByte 32 (S.drop 1 rest) -- ' '
70− (!path,!query) = S.breakByte 63 pathQuery -- '?'
69+ | otherwise = S.break (== 32) (S.drop 1 rest) -- ' '
70+ (!path,!query) = S.break (== 63) pathQuery -- '?'
7171 !httpVer = S.drop 1 httpVer'
7272 (!http,!ver)
7373 | httpVer == "" = throw badmsg
74− | otherwise = S.breakByte 47 httpVer -- '/'
74+ | otherwise = S.break (== 47) httpVer -- '/'
7575 !hv | http /= "HTTP" = throw NonHttp
7676 | ver == "/1.1" = H.http11
7777 | otherwise = H.http10
@@ -169,13 +169,13 @@ parseRequestLine1 :: ByteString
169169 ,ByteString -- Query
170170 ,H.HttpVersion)
171171parseRequestLine1 requestLine = do
172− let (!method,!rest) = S.breakByte 32 requestLine -- ' '
173− (!pathQuery,!httpVer') = S.breakByte 32 (S.drop 1 rest) -- ' '
172+ let (!method,!rest) = S.break (== 32) requestLine -- ' '
173+ (!pathQuery,!httpVer') = S.break (== 32) (S.drop 1 rest) -- ' '
174174 !httpVer = S.drop 1 httpVer'
175175 when (rest == "" || httpVer == "") $
176176 throwIO $ BadFirstLine $ B.unpack requestLine
177− let (!path,!query) = S.breakByte 63 pathQuery -- '?'
178− (!http,!ver) = S.breakByte 47 httpVer -- '/'
177+ let (!path,!query) = S.break (== 63) pathQuery -- '?'
178+ (!http,!ver) = S.break (== 47) httpVer -- '/'
179179 when (http /= "HTTP") $ throwIO NonHttp
180180 let !hv | ver == "/1.1" = H.http11
181181 | otherwise = H.http10
@@ -205,7 +205,7 @@ parseRequestLine0 s =
205205 !http' = S.concat http''
206206 (!hfirst, !hsecond) = S.splitAt 5 http'
207207 if hfirst == "HTTP/"
208− then let (!rpath, !qstring) = S.breakByte 63 query -- '?'
208+ then let (!rpath, !qstring) = S.break (== 63) query -- '?'
209209 !hv =
210210 case hsecond of
211211 "1.1" -> H.http11
warp/warp.cabal+46
@@ -136,6 +136,44 @@ Test-Suite spec
136136 SendFileSpec
137137 WithApplicationSpec
138138 HTTP
139+ Network.Wai.Handler.Warp
140+ Network.Wai.Handler.Warp.Buffer
141+ Network.Wai.Handler.Warp.Conduit
142+ Network.Wai.Handler.Warp.Counter
143+ Network.Wai.Handler.Warp.Date
144+ Network.Wai.Handler.Warp.FdCache
145+ Network.Wai.Handler.Warp.File
146+ Network.Wai.Handler.Warp.FileInfoCache
147+ Network.Wai.Handler.Warp.HTTP2
148+ Network.Wai.Handler.Warp.HTTP2.EncodeFrame
149+ Network.Wai.Handler.Warp.HTTP2.File
150+ Network.Wai.Handler.Warp.HTTP2.HPACK
151+ Network.Wai.Handler.Warp.HTTP2.Manager
152+ Network.Wai.Handler.Warp.HTTP2.Receiver
153+ Network.Wai.Handler.Warp.HTTP2.Request
154+ Network.Wai.Handler.Warp.HTTP2.Sender
155+ Network.Wai.Handler.Warp.HTTP2.Types
156+ Network.Wai.Handler.Warp.HTTP2.Worker
157+ Network.Wai.Handler.Warp.HashMap
158+ Network.Wai.Handler.Warp.Header
159+ Network.Wai.Handler.Warp.IO
160+ Network.Wai.Handler.Warp.Imports
161+ Network.Wai.Handler.Warp.MultiMap
162+ Network.Wai.Handler.Warp.PackInt
163+ Network.Wai.Handler.Warp.ReadInt
164+ Network.Wai.Handler.Warp.Recv
165+ Network.Wai.Handler.Warp.Request
166+ Network.Wai.Handler.Warp.RequestHeader
167+ Network.Wai.Handler.Warp.Response
168+ Network.Wai.Handler.Warp.ResponseHeader
169+ Network.Wai.Handler.Warp.Run
170+ Network.Wai.Handler.Warp.SendFile
171+ Network.Wai.Handler.Warp.Settings
172+ Network.Wai.Handler.Warp.Timeout
173+ Network.Wai.Handler.Warp.Types
174+ Network.Wai.Handler.Warp.WithApplication
175+ Paths_warp
176+
139177 Hs-Source-Dirs: test, .
140178 Type: exitcode-stdio-1.0
141179
@@ -185,6 +223,14 @@ Test-Suite spec
185223Benchmark parser
186224 Type: exitcode-stdio-1.0
187225 Main-Is: Parser.hs
226+ other-modules: Network.Wai.Handler.Warp.Date
227+ Network.Wai.Handler.Warp.FdCache
228+ Network.Wai.Handler.Warp.FileInfoCache
229+ Network.Wai.Handler.Warp.HashMap
230+ Network.Wai.Handler.Warp.Imports
231+ Network.Wai.Handler.Warp.MultiMap
232+ Network.Wai.Handler.Warp.Timeout
233+ Network.Wai.Handler.Warp.Types
188234 HS-Source-Dirs: bench .
189235 Build-Depends: base >= 4.8 && < 5
190236 , auto-update