9cc38b6 · typeable/wai

git.iko.soy/typeable/wai

No ResponseLBS

commit9cc38b686261473f44ddf08a101b7b8828ee0dcc authorMichael Snoyman <michael@snoyman.com> dateTue 21 Dec 2010, 00:08 (16 years ago) parent51a6140

3 files changed+3−12

compare with master

unifiedsplit

Network/Wai/Handler/SimpleServer.hs+2−10 Network/Wai/Middleware/CleanPath.hs+1−1 Network/Wai/Middleware/Jsonp.hs−1

Network/Wai/Handler/SimpleServer.hs+2−10

@@ -34,13 +34,13 @@ import System.IO (Handle, hClose, hFlush)

3434import System.IO.Error (isEOFError, ioeGetHandle)

3535import Control.Concurrent (forkIO)

3636import Control.Monad (unless)

37−import Data.Maybe (isJust, fromJust, fromMaybe)

37+import Data.Maybe (fromMaybe)

3838

3939import Data.Typeable (Typeable)

4040

4141import Control.Arrow (first)

4242

43−import Data.Enumerator (($$), Enumerator, enumList, (>>==))

43+import Data.Enumerator (($$), (>>==))

4444import qualified Data.Enumerator as E

4545import Data.Enumerator.IO (iterHandle)

4646import Blaze.ByteString.Builder.Enumerator (builderToByteString)

@@ -210,11 +210,3 @@ parseHeaderNoAttr s =

210210 then B.drop 2 rest

211211 else rest

212212 in (k, rest')

213−

214−after :: Enumerator Builder IO b -> E.Enumeratee Builder Builder IO b

215−after enum =

216− loop

217− where

218− loop = E.checkDone $ E.continue . step

219− step k E.EOF = enum (E.Continue k) >>== return

220− step k s = k s >>== loop

Network/Wai/Middleware/CleanPath.hs+1−1

@@ -16,7 +16,7 @@ cleanPath splitter prefix app env =

1616 case splitter $ pathInfo env of

1717 Right pieces -> app pieces env

1818 Left p -> return

19− $ ResponseLBS status301

19+ $ responseLBS status301

2020 [("Location", B.concat [prefix, p, suffix])]

2121 $ L.empty

2222 where

Network/Wai/Middleware/Jsonp.hs−1

@@ -65,7 +65,6 @@ jsonp app env = do

6565 Nothing -> return res

6666 Just c -> go c res

6767 where

68− go c r@(ResponseLBS _ hs _) = go' c r hs

6968 go c r@(ResponseFile _ hs _) = go' c r hs

7069 go c (ResponseEnumerator e) = addCallback c e

7170 go' c r hs =