Exodus to GHC 6.8.1

[Lucu.git] / Network / HTTP / Lucu / DefaultPage.hs

diff --git a/Network/HTTP/Lucu/DefaultPage.hs b/Network/HTTP/Lucu/DefaultPage.hs
index f53501f707f1b36d2dec25f021607a42e694e9cf..6a980104d3dfe6a1f6d9b66202b9898aaa0ae1fd 100644 (file)
--- a/Network/HTTP/Lucu/DefaultPage.hs
+++ b/Network/HTTP/Lucu/DefaultPage.hs
@@ -19,7 +19,7 @@ import           Network.HTTP.Lucu.Headers
 import           Network.HTTP.Lucu.Interaction
 import           Network.HTTP.Lucu.Request
 import           Network.HTTP.Lucu.Response
-import           Network.URI
+import           Network.URI hiding (path)
 import           System.IO.Unsafe
 import           Text.XML.HXT.Arrow.WriteDocument
 import           Text.XML.HXT.Arrow.XmlArrow
@@ -44,10 +44,8 @@ getDefaultPage conf req res
 writeDefaultPage :: Interaction -> STM ()
 writeDefaultPage itr
     = itr `seq`
-      do wroteHeader <- readTVar (itrWroteHeader itr)
-
-         -- Content-Type が正しくなければ補完できない。
-         res <- readItr itr itrResponse id
+      -- Content-Type が正しくなければ補完できない。
+      do res <- readItr itr itrResponse id
          when (getHeader (C8.pack "Content-Type") res == Just defaultPageContentType)
                   $ do reqM <- readItr itr itrRequest id
 
@@ -75,11 +73,11 @@ mkDefaultPage conf status msgA
                 += sattr "xmlns" "http://www.w3.org/1999/xhtml"
                 += ( eelem "head"
                      += ( eelem "title"
-                          += txt (fmtDec 3 sCode ++ " " ++ sMsg)
+                          += txt (fmtDec 3 sCode ++ " " ++ C8.unpack sMsg)
                         ))
                 += ( eelem "body"
                      += ( eelem "h1"
-                          += txt sMsg
+                          += txt (C8.unpack sMsg)
                         )
                      += ( eelem "p" += msgA )
                      += eelem "hr"