git.iko.soy/typeable/wai
on master help sign in
Fix some warnings
commite61483c708ffc319470e2d73573b3fd74b1c8e13 authorMichael Snoyman <michael@snoyman.com> dateWed 4 Dec 2013, 05:41 (13 years ago) parent7e65519
6 files changed+7−10
compare with master
unifiedsplit
wai-extra/Network/Wai/Handler/CGI.hs+1 wai-extra/Network/Wai/Middleware/Gzip.hs−4 wai-extra/Network/Wai/Middleware/Jsonp.hs−1 wai-test/Network/Wai/Test.hs−3 warp-tls/Network/Wai/Handler/WarpTLS.hs+4 warp/warp.cabal+2−2
wai-extra/Network/Wai/Handler/CGI.hs+1
@@ -110,6 +110,7 @@ runGeneric vars inputH outputH xsendfile app = do
110110 , vault = mempty
111111 , requestBodyLength = KnownLength $ fromIntegral contentLength
112112 , requestHeaderHost = lookup "host" reqHeaders
113+ , requestHeaderRange = lookup "range" reqHeaders
113114 }
114115 -- FIXME worry about exception?
115116 res <- restore $ app env
wai-extra/Network/Wai/Middleware/Gzip.hs−4
@@ -92,10 +92,6 @@ gzip set app env = do
9292 `fmap` lookup "Accept-Encoding" (requestHeaders env)
9393 ua = fromMaybe "" $ lookup "user-agent" $ requestHeaders env
9494 isMSIE6 = "MSIE 6" `S.isInfixOf` ua
95− responseHeaders res = case res of
96− ResponseFile _ h _ _ -> h
97− ResponseBuilder _ h _ -> h
98− ResponseSource _ h _ -> h
9995 isEncoded res = isJust $ lookup "Content-Encoding" $ responseHeaders res
10096
10197compressFile :: Status -> [Header] -> FilePath -> FilePath -> IO Response
wai-extra/Network/Wai/Middleware/Jsonp.hs−1
@@ -26,7 +26,6 @@ import Control.Monad (join)
2626import Data.Maybe (fromMaybe)
2727import qualified Data.ByteString as S
2828import qualified Data.Conduit as C
29−import qualified Data.Conduit.List as CL
3029import Data.CaseInsensitive (CI)
3130import Network.HTTP.Types (Status)
3231
wai-test/Network/Wai/Test.hs−3
@@ -22,7 +22,6 @@ module Network.Wai.Test
2222 ) where
2323
2424import Network.Wai
25−import Network.Wai.Internal (Request (Request))
2625import qualified Test.HUnit.Base as H
2726import Control.Monad.IO.Class (liftIO)
2827import Control.Monad.Trans.State (StateT, evalStateT)
@@ -43,8 +42,6 @@ import qualified Data.Text as T
4342import qualified Data.Text.Encoding as TE
4443import qualified Data.Conduit as C
4544import qualified Data.Conduit.List as CL
46−import Data.Monoid (mempty)
47−import Network.Socket.Internal (SockAddr (SockAddrInet))
4845
4946type Session = ReaderT Application (StateT ClientState IO)
5047
warp-tls/Network/Wai/Handler/WarpTLS.hs+4
@@ -49,6 +49,7 @@ import qualified Data.Conduit.Binary as CB
4949#if MIN_VERSION_tls(1, 1, 3)
5050import qualified Crypto.Random.AESCtr
5151#endif
52+import Network.Wai.Handler.Warp.Buffer
5253
5354data TLSSettings = TLSSettings
5455 { certFile :: FilePath
@@ -149,6 +150,8 @@ runTLSSocket TLSSettings {..} set sock app = do
149150 params
150151 gen
151152 TLS.handshake ctx
153+ buf <- allocateBuffer bufferSize
154+ blazeBuf <- toBlazeBuffer buf bufferSize
152155 let conn = Connection
153156 { connSendMany = TLS.sendData ctx . L.fromChunks
154157 , connSendAll = TLS.sendData ctx . L.fromChunks . return
@@ -160,6 +163,7 @@ runTLSSocket TLSSettings {..} set sock app = do
160163 TLS.contextClose ctx
161164 , connRecv = TLS.recvData ctx
162165 , connSendFileOverride = NotOverride
166+ , connBuffer = blazeBuf
163167 }
164168 return conn
165169 else
warp/warp.cabal+2−2
@@ -53,9 +53,9 @@ Library
5353 else
5454 Build-Depends: network >= 2.3
5555 Exposed-modules: Network.Wai.Handler.Warp
56+ Network.Wai.Handler.Warp.Buffer
5657 Network.Wai.Handler.Warp.Timeout
57− Other-modules: Network.Wai.Handler.Warp.Buffer
58− Network.Wai.Handler.Warp.Conduit
58+ Other-modules: Network.Wai.Handler.Warp.Conduit
5959 Network.Wai.Handler.Warp.Date
6060 Network.Wai.Handler.Warp.FdCache
6161 Network.Wai.Handler.Warp.Header