X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FResponseWriter.hs;h=830baa68eb05ae0944c2cb19a35a412d5a58f971;hb=3d017dd65ddede9a11c5b7a34a91e04340e67bc4;hp=a676e1549cfee2d17916140b5178b4ffcb9dcd1c;hpb=15aa04a569fb13fb0793389f78f52b0255083cef;p=Lucu.git

diff --git a/Network/HTTP/Lucu/ResponseWriter.hs b/Network/HTTP/Lucu/ResponseWriter.hs
index a676e15..830baa6 100644
--- a/Network/HTTP/Lucu/ResponseWriter.hs
+++ b/Network/HTTP/Lucu/ResponseWriter.hs
@@ -3,7 +3,7 @@ module Network.HTTP.Lucu.ResponseWriter
     )
     where
 
-import qualified Data.ByteString.Lazy.Char8 as B
+import qualified Data.ByteString.Lazy.Char8 as C8
 import           Control.Concurrent
 import           Control.Concurrent.STM
 import           Control.Exception
@@ -36,15 +36,13 @@ responseWriter cnf h tQueue readerTID
           = {-# SCC "awaitSomethingToWrite" #-}
             do action
                    <- atomically $!
-                      do -- キューが空でなくなるまで待つ
-                         queue <- readTVar tQueue
-                         when (S.null queue)
-                              retry
-
+                      -- キューが空でなくなるまで待つ
+                      do queue <- readTVar tQueue
                          -- GettingBody 状態にあり、Continue が期待され
                          -- てゐて、それがまだ送信前なのであれば、
                          -- Continue を送信する。
                          case S.viewr queue of
+                           EmptyR   -> retry
                            _ :> itr -> do state <- readItr itr itrState id
 
                                           if state == GettingBody then
@@ -90,7 +88,7 @@ responseWriter cnf h tQueue readerTID
                  else
                    do bodyToSend <- readItr itr itrBodyToSend id
 
-                      if B.null bodyToSend then
+                      if C8.null bodyToSend then
                           do state <- readItr itr itrState id
 
                              if state == Done then
@@ -132,16 +130,16 @@ responseWriter cnf h tQueue readerTID
             do willDiscardBody <- atomically $! readItr itr itrWillDiscardBody id
                willChunkBody   <- atomically $! readItr itr itrWillChunkBody   id
                chunk           <- atomically $! do chunk <- readItr itr itrBodyToSend id
-                                                   writeItr itr itrBodyToSend B.empty
+                                                   writeItr itr itrBodyToSend C8.empty
                                                    return chunk
                unless willDiscardBody
                           $ do if willChunkBody then
-                                   do hPutStr h (fmtHex False 0 $! fromIntegral $! B.length chunk)
-                                      hPutStr h "\r\n"
-                                      B.hPut  h chunk
-                                      hPutStr h "\r\n"
+                                   do hPutStr h (fmtHex False 0 $! fromIntegral $! C8.length chunk)
+                                      C8.hPut h (C8.pack "\r\n")
+                                      C8.hPut h chunk
+                                      C8.hPut h (C8.pack "\r\n")
                                  else
-                                   B.hPut h chunk
+                                   C8.hPut h chunk
                                hFlush h
                awaitSomethingToWrite
 
@@ -152,7 +150,7 @@ responseWriter cnf h tQueue readerTID
             do willDiscardBody <- atomically $! readItr itr itrWillDiscardBody id
                willChunkBody   <- atomically $! readItr itr itrWillChunkBody   id
                when (not willDiscardBody && willChunkBody)
-                        $ hPutStr h "0\r\n\r\n" >> hFlush h
+                        $ C8.hPut h (C8.pack "0\r\n\r\n") >> hFlush h
 
       finalize :: Interaction -> IO ()
       finalize itr
@@ -163,6 +161,7 @@ responseWriter cnf h tQueue readerTID
                             do queue <- readTVar tQueue
 
                                case S.viewr queue of
+                                 EmptyR         -> return () -- this should never happen
                                  remaining :> _ -> writeTVar tQueue remaining
 
                                readItr itr itrWillClose id