bd17d89 · typeable/wai

git.iko.soy/typeable/wai

utf8-string -> text

commitbd17d89c435993848cf710105bceff33a2111550 authorMichael Snoyman <michael@snoyman.com> dateThu 30 Dec 2010, 06:50 (16 years ago) parentec29f3f

2 files changed+11−10

compare with master

unifiedsplit

Network/Wai/Handler/DevelServer.hs+3−2 wai-handler-devel.cabal+8−8

Network/Wai/Handler/DevelServer.hs+3−2

@@ -6,7 +6,8 @@ module Network.Wai.Handler.DevelServer (run, runNoWatch) where

66import Language.Haskell.Interpreter

77import Network.Wai

9−import qualified Data.ByteString.Lazy.UTF8 as U

9+import Data.Text.Lazy (pack)

10+import Data.Text.Lazy.Encoding (encodeUtf8)

1011import qualified Data.ByteString.Lazy.Char8 as L8

1112import Network

1213 ( listenOn, accept, sClose, PortID(PortNumber), Socket

@@ -62,7 +63,7 @@ startApp queue withApp = do

6263 onErr :: SomeException -> IO Response

6364 onErr e = return

6465 $ Response status500 [("Content-Type", "text/plain; charset=utf-8")]

65− $ ResponseLBS $ U.fromString

66+ $ ResponseLBS $ encodeUtf8 $ pack

6667 $ "Exception thrown while running application\n\n" ++ show e

6768 void x = x >> return ()

6869

wai-handler-devel.cabal+8−8

@@ -21,14 +21,14 @@ Source-repository head

2121 location: git://github.com/snoyberg/wai-handler-devel.git

2222

2323Library

24− Build-Depends: base >= 3 && < 5

25− , wai >= 0.2.1 && < 0.3

26− , wai-extra >= 0.2.3 && < 0.3

27− , directory >= 1.0 && < 1.2

28− , network >= 2.2 && < 2.4

29− , bytestring >= 0.9 && < 0.10

30− , hint >= 0.3.2.3 && < 0.4

31− , utf8-string >= 0.3 && < 0.4

24+ Build-Depends: base >= 4 && < 5

25+ , wai >= 0.2.1 && < 0.3

26+ , wai-extra >= 0.2.3 && < 0.3

27+ , directory >= 1.0 && < 1.2

28+ , network >= 2.2 && < 2.4

29+ , bytestring >= 0.9 && < 0.10

30+ , hint >= 0.3.2.3 && < 0.4

31+ , text >= 0.7 && < 0.12

3232 Exposed-modules: Network.Wai.Handler.DevelServer

3333 ghc-options: -Wall

3434