X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FResource.hs;h=01b61813971e9e1ce4ba80e18ed374e400a5ce5a;hb=ea2b7838f1b3d9d4923a220a601be2e04cc559d7;hp=96863f044dad4c803bdd42360e27d67cac5b8105;hpb=858129cb755aa09da2b7bd758efb8519f2c89103;p=Lucu.git

diff --git a/Network/HTTP/Lucu/Resource.hs b/Network/HTTP/Lucu/Resource.hs
index 96863f0..01b6181 100644
--- a/Network/HTTP/Lucu/Resource.hs
+++ b/Network/HTTP/Lucu/Resource.hs
@@ -1,8 +1,15 @@
--- #prune
+{-# LANGUAGE
+    GeneralizedNewtypeDeriving
+  , DoAndIfThenElse
+  , OverloadedStrings
+  , RecordWildCards
+  , UnicodeSyntax
+  #-}
 
 -- |This is the Resource Monad; monadic actions to define the behavior
--- of each resources. The 'Resource' Monad is a kind of IO Monad thus
--- it implements MonadIO class. It is also a state machine.
+-- of each resources. The 'Resource' Monad is a kind of 'Prelude.IO'
+-- Monad thus it implements 'Control.Monad.Trans.MonadIO' class. It is
+-- also a state machine.
 -- 
 -- Request Processing Flow:
 --
@@ -59,8 +66,10 @@
 
 module Network.HTTP.Lucu.Resource
     (
-    -- * Monad
-    Resource
+    -- * Types
+      Resource
+    , FormData(..)
+    , runRes
 
     -- * Actions
 
@@ -71,15 +80,21 @@ module Network.HTTP.Lucu.Resource
     , getConfig
     , getRemoteAddr
     , getRemoteAddr'
+    , getRemoteHost
+    , getRemoteCertificate
     , getRequest
     , getMethod
     , getRequestURI
+    , getRequestVersion
     , getResourcePath
     , getPathInfo
     , getQueryForm
     , getHeader
     , getAccept
+    , getAcceptEncoding
+    , isEncodingAcceptable
     , getContentType
+    , getAuthorization
 
     -- ** Finding an entity
 
@@ -97,8 +112,6 @@ module Network.HTTP.Lucu.Resource
     -- Body/.
     , input
     , inputChunk
-    , inputBS
-    , inputChunkBS
     , inputForm
     , defaultLimit
 
@@ -111,6 +124,8 @@ module Network.HTTP.Lucu.Resource
     , redirect
     , setContentType
     , setLocation
+    , setContentEncoding
+    , setWWWAuthenticate
 
     -- ** Writing a response body
 
@@ -118,91 +133,121 @@ module Network.HTTP.Lucu.Resource
     -- Body/.
     , output
     , outputChunk
-    , outputBS
-    , outputChunkBS
 
-    , driftTo
+    , driftTo -- private
     )
     where
-
-import           Control.Concurrent.STM
-import           Control.Monad.Reader
-import           Data.Bits
-import qualified Data.ByteString.Lazy.Char8 as B
-import           Data.ByteString.Lazy.Char8 (ByteString)
-import           Data.List
-import           Data.Maybe
-import           GHC.Conc (unsafeIOToSTM)
-import           Network.HTTP.Lucu.Abortion
-import           Network.HTTP.Lucu.Config
-import           Network.HTTP.Lucu.DefaultPage
-import           Network.HTTP.Lucu.ETag
+import Blaze.ByteString.Builder (Builder)
+import qualified Blaze.ByteString.Builder.ByteString as BB
+import Control.Applicative
+import Control.Concurrent.STM
+import Control.Monad.Reader
+import Control.Monad.Unicode
+import Data.Ascii (Ascii, CIAscii)
+import qualified Data.Ascii as A
+import qualified Data.Attoparsec.Char8 as P
+import qualified Data.Attoparsec.Lazy  as LP
+import Data.ByteString (ByteString)
+import qualified Data.ByteString as Strict
+import qualified Data.ByteString.Lazy as Lazy
+import Data.Foldable (toList)
+import Data.List
+import qualified Data.Map as M
+import Data.Maybe
+import Data.Monoid
+import Data.Monoid.Unicode
+import Data.Sequence (Seq)
+import Data.Text (Text)
+import qualified Data.Text as T
+import qualified Data.Text.Encoding as T
+import Data.Time
+import qualified Data.Time.HTTP as HTTP
+import Network.HTTP.Lucu.Abortion
+import Network.HTTP.Lucu.Authorization
+import Network.HTTP.Lucu.Config
+import Network.HTTP.Lucu.ContentCoding
+import Network.HTTP.Lucu.DefaultPage
+import Network.HTTP.Lucu.ETag
 import qualified Network.HTTP.Lucu.Headers as H
-import           Network.HTTP.Lucu.HttpVersion
-import           Network.HTTP.Lucu.Interaction
-import           Network.HTTP.Lucu.Parser
-import           Network.HTTP.Lucu.Postprocess
-import           Network.HTTP.Lucu.RFC1123DateTime
-import           Network.HTTP.Lucu.Request
-import           Network.HTTP.Lucu.Response
-import           Network.HTTP.Lucu.MIMEType
-import           Network.HTTP.Lucu.Utils
-import           Network.Socket
-import           Network.URI
-import           System.Time
-
--- |The 'Resource' monad. /Interaction/ is an internal state thus it
--- is not exposed to users. This monad implements 'MonadIO' so it can
--- do any IO actions.
-type Resource a = ReaderT Interaction IO a
-
--- |Get the 'Network.HTTP.Lucu.Config.Config' value which is used for
--- the httpd.
-getConfig :: Resource Config
-getConfig = do itr <- ask
-               return $! itrConfig itr
-
-
--- |Get the SockAddr of the remote host. If you want a string
--- representation instead of SockAddr, use 'getRemoteAddr''.
-getRemoteAddr :: Resource SockAddr
-getRemoteAddr = do itr <- ask
-                   return $! itrRemoteAddr itr
-
+import Network.HTTP.Lucu.HttpVersion
+import Network.HTTP.Lucu.Interaction
+import Network.HTTP.Lucu.MultipartForm
+import Network.HTTP.Lucu.Postprocess
+import Network.HTTP.Lucu.Request
+import Network.HTTP.Lucu.Response
+import Network.HTTP.Lucu.MIMEType
+import Network.HTTP.Lucu.Utils
+import Network.Socket hiding (accept)
+import Network.URI hiding (path)
+import OpenSSL.X509
+import Prelude.Unicode
+
+-- |The 'Resource' monad. This monad implements 'MonadIO' so it can do
+-- any 'IO' actions.
+newtype Resource a
+    = Resource {
+        unRes ∷ ReaderT Interaction IO a
+      }
+    deriving (Applicative, Functor, Monad, MonadIO)
+
+runRes ∷ Resource a → Interaction → IO a
+runRes r itr
+    = runReaderT (unRes r) itr
+
+getInteraction ∷ Resource Interaction
+getInteraction = Resource ask
+
+-- |Get the 'Config' value which is used for the httpd.
+getConfig ∷ Resource Config
+getConfig = itrConfig <$> getInteraction
+
+-- |Get the 'SockAddr' of the remote host. If you want a string
+-- representation instead of 'SockAddr', use 'getRemoteAddr''.
+getRemoteAddr ∷ Resource SockAddr
+getRemoteAddr = itrRemoteAddr <$> getInteraction
 
 -- |Get the string representation of the address of remote host. If
--- you want a SockAddr instead of String, use 'getRemoteAddr'.
-getRemoteAddr' :: Resource String
-getRemoteAddr' = do addr <- getRemoteAddr
-                    case addr of
-                      -- Network.Socket は IPv6 を考慮してゐないやうだ…
-                      (SockAddrInet _ v4addr)
-                          -> let b1 = (v4addr `shiftR` 24) .&. 0xFF
-                                 b2 = (v4addr `shiftR` 16) .&. 0xFF
-                                 b3 = (v4addr `shiftR`  8) .&. 0xFF
-                                 b4 =  v4addr              .&. 0xFF
-                             in
-                               return $ concat $ intersperse "." $ map show [b1, b2, b3, b4]
-                      (SockAddrUnix path)
-                          -> return path
-
-
--- |Get the 'Network.HTTP.Lucu.Request.Request' value which represents
--- the request header. In general you don't have to use this action.
-getRequest :: Resource Request
-getRequest = do itr <- ask
-                req <- liftIO $! atomically $! readItr itr itrRequest fromJust
-                return req
-
--- |Get the 'Network.HTTP.Lucu.Request.Method' value of the request.
-getMethod :: Resource Method
-getMethod = do req <- getRequest
-               return $! reqMethod req
+-- you want a 'SockAddr' instead of 'String', use 'getRemoteAddr'.
+getRemoteAddr' ∷ Resource HostName
+getRemoteAddr'
+    = do sa          ← getRemoteAddr
+         (Just a, _) ← liftIO $ getNameInfo [NI_NUMERICHOST] False False sa
+         return a
+
+-- |Resolve an address to the remote host.
+getRemoteHost ∷ Resource (Maybe HostName)
+getRemoteHost
+    = do sa ← getRemoteAddr
+         fst <$> (liftIO $ getNameInfo [] True False sa)
+
+-- | Return the X.509 certificate of the client, or 'Nothing' if:
+--
+--   * This request didn't came through an SSL stream.
+--
+--   * The client didn't send us its certificate.
+--
+--   * The 'OpenSSL.Session.VerificationMode' of
+--   'OpenSSL.Session.SSLContext' in 'SSLConfig' has not been set to
+--   'OpenSSL.Session.VerifyPeer'.
+getRemoteCertificate ∷ Resource (Maybe X509)
+getRemoteCertificate = itrRemoteCert <$> getInteraction
+
+-- |Get the 'Request' value which represents the request header. In
+-- general you don't have to use this action.
+getRequest ∷ Resource Request
+getRequest = (fromJust ∘ itrRequest) <$> getInteraction
+
+-- |Get the 'Method' value of the request.
+getMethod ∷ Resource Method
+getMethod = reqMethod <$> getRequest
 
 -- |Get the URI of the request.
-getRequestURI :: Resource URI
-getRequestURI = do req <- getRequest
-                   return $! reqURI req
+getRequestURI ∷ Resource URI
+getRequestURI = reqURI <$> getRequest
+
+-- |Get the HTTP version of the request.
+getRequestVersion ∷ Resource HttpVersion
+getRequestVersion = reqVersion <$> getRequest
 
 -- |Get the path of this 'Resource' (to be exact,
 -- 'Network.HTTP.Lucu.Resource.Tree.ResourceDef') in the
@@ -217,73 +262,155 @@ getRequestURI = do req <- getRequest
 -- >
 -- > resFoo = ResourceDef {
 -- >     resIsGreedy = True
--- >   , resGet = Just $ do requestURI   <- getRequestURI
--- >                        resourcePath <- getResourcePath
--- >                        pathInfo     <- getPathInfo
+-- >   , resGet = Just $ do requestURI   ← getRequestURI
+-- >                        resourcePath ← getResourcePath
+-- >                        pathInfo     ← getPathInfo
 -- >                        -- uriPath requestURI == "/foo/bar/baz"
 -- >                        -- resourcePath       == ["foo"]
 -- >                        -- pathInfo           == ["bar", "baz"]
 -- >                        ...
 -- >   , ...
 -- >   }
-getResourcePath :: Resource [String]
-getResourcePath = do itr <- ask
-                     return $! fromJust $! itrResourcePath itr
-
-
--- |This is an analogy of CGI PATH_INFO. Its result is always @[]@ if
--- the 'Network.HTTP.Lucu.Resource.Tree.ResourceDef' is not
--- greedy. See 'getResourcePath'.
-getPathInfo :: Resource [String]
-getPathInfo = do rsrcPath <- getResourcePath
-                 reqURI   <- getRequestURI
-                 let reqPathStr = uriPath reqURI
-                     reqPath    = [x | x <- splitBy (== '/') reqPathStr, x /= ""]
+getResourcePath ∷ Resource [Text]
+getResourcePath = (fromJust ∘ itrResourcePath) <$> getInteraction
+
+-- |This is an analogy of CGI PATH_INFO. The result is
+-- URI-unescaped. It is always @[]@ if the
+-- 'Network.HTTP.Lucu.Resource.Tree.ResourceDef' is not greedy. See
+-- 'getResourcePath'.
+--
+-- Note that the returned path is URI-decoded and then UTF-8 decoded.
+getPathInfo ∷ Resource [Text]
+getPathInfo = do rsrcPath ← getResourcePath
+                 reqPath  ← splitPathInfo <$> getRequestURI
                  -- rsrcPath と reqPath の共通する先頭部分を reqPath か
                  -- ら全部取り除くと、それは PATH_INFO のやうなものにな
                  -- る。rsrcPath は全部一致してゐるに決まってゐる（でな
                  -- ければこの Resource が撰ばれた筈が無い）ので、
                  -- rsrcPath の長さの分だけ削除すれば良い。
-                 return $! drop (length rsrcPath) reqPath
-
--- | Assume the query part of request URI as
--- application\/x-www-form-urlencoded, and parse it. This action
--- doesn't parse the request body. See 'inputForm'.
-getQueryForm :: Resource [(String, String)]
-getQueryForm = do reqURI <- getRequestURI
-                  return $! parseWWWFormURLEncoded $ uriQuery reqURI
+                 return $ drop (length rsrcPath) reqPath
+
+-- |Assume the query part of request URI as
+-- application\/x-www-form-urlencoded, and parse it to pairs of
+-- @(name, formData)@. This action doesn't parse the request body. See
+-- 'inputForm'. Field names are decoded in UTF-8.
+getQueryForm ∷ Resource [(Text, FormData)]
+getQueryForm = parse' <$> getRequestURI
+    where
+      parse' = map toPairWithFormData ∘
+               parseWWWFormURLEncoded ∘
+               fromJust ∘
+               A.fromChars ∘
+               drop 1 ∘
+               uriQuery
+
+toPairWithFormData ∷ (ByteString, ByteString) → (Text, FormData)
+toPairWithFormData (name, value)
+    = let fd = FormData {
+                 fdFileName = Nothing
+               , fdContent  = Lazy.fromChunks [value]
+               }
+      in (T.decodeUtf8 name, fd)
 
 -- |Get a value of given request header. Comparison of header name is
 -- case-insensitive. Note that this action is not intended to be used
 -- so frequently: there should be actions like 'getContentType' for
 -- every common headers.
-getHeader :: String -> Resource (Maybe String)
-getHeader name = name `seq`
-                 do req <- getRequest
-                    return $! H.getHeader name req
-
--- |Get a list of 'Network.HTTP.Lucu.MIMEType.MIMEType' enumerated on
--- header \"Accept\".
-getAccept :: Resource [MIMEType]
-getAccept = do accept <- getHeader "Accept"
-               if accept == Nothing then
-                   return []
-                 else
-                   case parseStr mimeTypeListP $ fromJust accept of
-                     (Success xs, _) -> return xs
-                     _               -> return []
-
--- |Get the header \"Content-Type\" as
--- 'Network.HTTP.Lucu.MIMEType.MIMEType'.
-getContentType :: Resource (Maybe MIMEType)
-getContentType = do cType <- getHeader "Content-Type"
-                    if cType == Nothing then
-                        return Nothing
-                      else
-                        case parseStr mimeTypeP $ fromJust cType of
-                          (Success t, _) -> return $ Just t
-                          _              -> return Nothing
+getHeader ∷ CIAscii → Resource (Maybe Ascii)
+getHeader name
+    = H.getHeader name <$> getRequest
+
+-- |Get a list of 'MIMEType' enumerated on header \"Accept\".
+getAccept ∷ Resource [MIMEType]
+getAccept
+    = do acceptM ← getHeader "Accept"
+         case acceptM of
+           Nothing
+               → return []
+           Just accept
+               → case P.parseOnly p (A.toByteString accept) of
+                    Right xs → return xs
+                    Left  _  → abort BadRequest []
+                               (Just $ "Unparsable Accept: " ⊕ A.toText accept)
+    where
+      p = do xs ← mimeTypeListP
+             P.endOfInput
+             return xs
+
+-- |Get a list of @(contentCoding, qvalue)@ enumerated on header
+-- \"Accept-Encoding\". The list is sorted in descending order by
+-- qvalue.
+getAcceptEncoding ∷ Resource [(CIAscii, Maybe Double)]
+getAcceptEncoding
+    = do accEncM ← getHeader "Accept-Encoding"
+         case accEncM of
+           Nothing
+               -- HTTP/1.0 には Accept-Encoding が無い場合の規定が無い
+               -- ので安全の爲 identity が指定された事にする。HTTP/1.1
+               -- の場合は何でも受け入れて良い事になってゐるので "*" が
+               -- 指定された事にする。
+               → do ver ← getRequestVersion
+                    case ver of
+                      HttpVersion 1 0 → return [("identity", Nothing)]
+                      HttpVersion 1 1 → return [("*"       , Nothing)]
+                      _               → abort InternalServerError []
+                                        (Just "getAcceptEncoding: unknown HTTP version")
+           Just ae
+               → if ae ≡ "" then
+                      -- identity のみが許される。
+                      return [("identity", Nothing)]
+                  else
+                      case P.parseOnly p (A.toByteString ae) of
+                        Right xs → return $ map toTuple $ reverse $ sort xs
+                        Left  _  → abort BadRequest []
+                                   (Just $ "Unparsable Accept-Encoding: " ⊕ A.toText ae)
+    where
+      p = do xs ← acceptEncodingListP
+             P.endOfInput
+             return xs
 
+      toTuple (AcceptEncoding {..})
+          = (aeEncoding, aeQValue)
+
+-- |Check whether a given content-coding is acceptable.
+isEncodingAcceptable ∷ CIAscii → Resource Bool
+isEncodingAcceptable encoding = any f <$> getAcceptEncoding
+    where
+      f (e, q)
+          = (e ≡ "*" ∨ e ≡ encoding) ∧ q ≢ Just 0
+
+-- |Get the header \"Content-Type\" as 'MIMEType'.
+getContentType ∷ Resource (Maybe MIMEType)
+getContentType
+    = do cTypeM ← getHeader "Content-Type"
+         case cTypeM of
+           Nothing
+               → return Nothing
+           Just cType
+               → case P.parseOnly p (A.toByteString cType) of
+                    Right t → return $ Just t
+                    Left  _ → abort BadRequest []
+                              (Just $ "Unparsable Content-Type: " ⊕ A.toText cType)
+    where
+      p = do t ← mimeTypeP
+             P.endOfInput
+             return t
+
+-- |Get the header \"Authorization\" as 'AuthCredential'.
+getAuthorization ∷ Resource (Maybe AuthCredential)
+getAuthorization
+    = do authM ← getHeader "Authorization"
+         case authM of
+           Nothing
+               → return Nothing
+           Just auth
+               → case P.parseOnly p (A.toByteString auth) of
+                    Right ac → return $ Just ac
+                    Left  _  → return Nothing
+    where
+      p = do ac ← authCredentialP
+             P.endOfInput
+             return ac
 
 
 {- ExaminingRequest 時に使用するアクション群 -}
@@ -291,7 +418,7 @@ getContentType = do cType <- getHeader "Content-Type"
 -- |Tell the system that the 'Resource' found an entity for the
 -- request URI. If this is a GET or HEAD request, a found entity means
 -- a datum to be replied. If this is a PUT or DELETE request, it means
--- a datum which was stored for the URI up to now. It is an error to
+-- a datum which was stored for the URI until now. It is an error to
 -- compute 'foundEntity' if this is a POST request.
 --
 -- Computation of 'foundEntity' performs \"If-Match\" test or
@@ -302,17 +429,16 @@ getContentType = do cType <- getHeader "Content-Type"
 --
 -- If this is a GET or HEAD request, 'foundEntity' automatically puts
 -- \"ETag\" and \"Last-Modified\" headers into the response.
-foundEntity :: ETag -> ClockTime -> Resource ()
+foundEntity ∷ ETag → UTCTime → Resource ()
 foundEntity tag timeStamp
-    = tag `seq` timeStamp `seq`
-      do driftTo ExaminingRequest
-
-         method <- getMethod
-         when (method == GET || method == HEAD)
-                  $ setHeader' "Last-Modified" $! formatHTTPDateTime timeStamp
-         when (method == POST)
-                  $ abort InternalServerError []
-                        (Just "Illegal computation of foundEntity for POST request.")
+    = do driftTo ExaminingRequest
+
+         method ← getMethod
+         when (method ≡ GET ∨ method ≡ HEAD)
+             $ setHeader' "Last-Modified" (HTTP.toAscii timeStamp)
+         when (method ≡ POST)
+             $ abort InternalServerError []
+               (Just "Illegal computation of foundEntity for a POST request.")
          foundETag tag
 
          driftTo GettingBody
@@ -322,51 +448,63 @@ foundEntity tag timeStamp
 -- 'foundETag' doesn't (and can't) put \"Last-Modified\" header into
 -- the response.
 --
--- This action is not preferred. You should use 'foundEntity' when
+-- This action is not preferred. You should use 'foundEntity' whenever
 -- possible.
-foundETag :: ETag -> Resource ()
+foundETag ∷ ETag → Resource ()
 foundETag tag
-    = tag `seq`
-      do driftTo ExaminingRequest
+    = do driftTo ExaminingRequest
       
-         method <- getMethod
-         when (method == GET || method == HEAD)
-                  $ setHeader' "ETag" $! show tag
-         when (method == POST)
-                  $ abort InternalServerError []
-                        (Just "Illegal computation of foundETag for POST request.")
+         method ← getMethod
+         when (method ≡ GET ∨ method ≡ HEAD)
+              $ setHeader' "ETag" (printETag tag)
+         when (method ≡ POST)
+              $ abort InternalServerError []
+                (Just "Illegal computation of foundETag for POST request.")
 
          -- If-Match があればそれを見る。
-         ifMatch <- getHeader "If-Match"
+         ifMatch ← getHeader "If-Match"
          case ifMatch of
-           Nothing   -> return ()
-           Just "*"  -> return ()
-           Just list -> case parseStr eTagListP list of
-                          (Success tags, _)
-                              -- tags の中に一致するものが無ければ
-                              -- PreconditionFailed で終了。
-                              -> when (not $ any (== tag) tags)
-                                 $ abort PreconditionFailed []
-                                       $! Just ("The entity tag doesn't match: " ++ list)
-                          _   -> abort BadRequest [] $! Just ("Unparsable If-Match: " ++ fromJust ifMatch)
-
-         let statusForNoneMatch = if method == GET || method == HEAD then
-                                      NotModified
-                                  else
-                                      PreconditionFailed
+           Nothing    → return ()
+           Just value → if value ≡ "*" then
+                            return ()
+                        else
+                            case P.parseOnly p (A.toByteString value) of
+                              Right tags
+                                 -- tags の中に一致するものが無ければ
+                                 -- PreconditionFailed で終了。
+                                 → when ((¬) (any (≡ tag) tags))
+                                       $ abort PreconditionFailed []
+                                         (Just $ "The entity tag doesn't match: " ⊕ A.toText value)
+                              Left _
+                                   → abort BadRequest [] (Just $ "Unparsable If-Match: " ⊕ A.toText value)
+
+         let statusForNoneMatch
+                 = if method ≡ GET ∨ method ≡ HEAD then
+                       NotModified
+                   else
+                       PreconditionFailed
 
          -- If-None-Match があればそれを見る。
-         ifNoneMatch <- getHeader "If-None-Match"
+         ifNoneMatch ← getHeader "If-None-Match"
          case ifNoneMatch of
-           Nothing   -> return ()
-           Just "*"  -> abort statusForNoneMatch [] $! Just ("The entity tag matches: *")
-           Just list -> case parseStr eTagListP list of
-                          (Success tags, _)
-                              -> when (any (== tag) tags)
-                                 $ abort statusForNoneMatch [] $! Just ("The entity tag matches: " ++ list)
-                          _   -> abort BadRequest [] $! Just ("Unparsable If-None-Match: " ++ list)
+           Nothing    → return ()
+           Just value → if value ≡ "*" then
+                             abort statusForNoneMatch [] (Just "The entity tag matches: *")
+                         else
+                             case P.parseOnly p (A.toByteString value) of
+                               Right tags
+                                   → when (any (≡ tag) tags)
+                                         $ abort statusForNoneMatch []
+                                           (Just $ "The entity tag matches: " ⊕ A.toText value)
+                               Left _
+                                   → abort BadRequest []
+                                     (Just $ "Unparsable If-None-Match: " ⊕ A.toText value)
 
          driftTo GettingBody
+    where
+      p = do xs ← eTagListP
+             P.endOfInput
+             return xs
 
 -- |Tell the system that the 'Resource' found an entity for the
 -- request URI. The only difference from 'foundEntity' is that
@@ -376,48 +514,48 @@ foundETag tag
 -- modification time are unsafe because it is possible to mess up such
 -- tests by modifying the entity twice in a second.
 --
--- This action is not preferred. You should use 'foundEntity' when
+-- This action is not preferred. You should use 'foundEntity' whenever
 -- possible.
-foundTimeStamp :: ClockTime -> Resource ()
+foundTimeStamp ∷ UTCTime → Resource ()
 foundTimeStamp timeStamp
-    = timeStamp `seq`
-      do driftTo ExaminingRequest
+    = do driftTo ExaminingRequest
 
-         method <- getMethod
-         when (method == GET || method == HEAD)
-                  $ setHeader' "Last-Modified" $! formatHTTPDateTime timeStamp
-         when (method == POST)
-                  $ abort InternalServerError []
-                        (Just "Illegal computation of foundTimeStamp for POST request.")
+         method ← getMethod
+         when (method ≡ GET ∨ method ≡ HEAD)
+             $ setHeader' "Last-Modified" (HTTP.toAscii timeStamp)
+         when (method ≡ POST)
+             $ abort InternalServerError []
+               (Just "Illegal computation of foundTimeStamp for POST request.")
 
-         let statusForIfModSince = if method == GET || method == HEAD then
-                                       NotModified
-                                   else
-                                       PreconditionFailed
+         let statusForIfModSince
+                 = if method ≡ GET ∨ method ≡ HEAD then
+                       NotModified
+                   else
+                       PreconditionFailed
 
          -- If-Modified-Since があればそれを見る。
-         ifModSince <- getHeader "If-Modified-Since"
+         ifModSince ← getHeader "If-Modified-Since"
          case ifModSince of
-           Just str -> case parseHTTPDateTime str of
-                         Just lastTime
-                             -> when (timeStamp <= lastTime)
-                                $ abort statusForIfModSince []
-                                      $! Just ("The entity has not been modified since " ++ str)
-                         Nothing
-                             -> return () -- 不正な時刻は無視
-           Nothing  -> return ()
+           Just str → case HTTP.fromAscii str of
+                         Right lastTime
+                             → when (timeStamp ≤ lastTime)
+                               $ abort statusForIfModSince []
+                                 (Just $ "The entity has not been modified since " ⊕ A.toText str)
+                         Left _
+                             → return () -- 不正な時刻は無視
+           Nothing  → return ()
 
          -- If-Unmodified-Since があればそれを見る。
-         ifUnmodSince <- getHeader "If-Unmodified-Since"
+         ifUnmodSince ← getHeader "If-Unmodified-Since"
          case ifUnmodSince of
-           Just str -> case parseHTTPDateTime str of
-                         Just lastTime
-                             -> when (timeStamp > lastTime)
-                                $ abort PreconditionFailed []
-                                      $! Just  ("The entity has not been modified since " ++ str)
-                         Nothing
-                             -> return () -- 不正な時刻は無視
-           Nothing  -> return ()
+           Just str → case HTTP.fromAscii str of
+                         Right lastTime
+                             → when (timeStamp > lastTime)
+                               $ abort PreconditionFailed []
+                                 (Just $ "The entity has not been modified since " ⊕ A.toText str)
+                         Left _
+                             → return () -- 不正な時刻は無視
+           Nothing  → return ()
 
          driftTo GettingBody
 
@@ -429,20 +567,19 @@ foundTimeStamp timeStamp
 -- test and aborts with status \"412 Precondition Failed\" when it
 -- failed. If this is a GET, HEAD, POST or DELETE request,
 -- 'foundNoEntity' always aborts with status \"404 Not Found\".
-foundNoEntity :: Maybe String -> Resource ()
+foundNoEntity ∷ Maybe Text → Resource ()
 foundNoEntity msgM
-    = msgM `seq`
-      do driftTo ExaminingRequest
+    = do driftTo ExaminingRequest
 
-         method <- getMethod
-         when (method /= PUT)
-                  $ abort NotFound [] msgM
+         method ← getMethod
+         when (method ≢ PUT)
+             $ abort NotFound [] msgM
 
          -- エンティティが存在しないと云ふ事は、"*" も含めたどのやうな
          -- If-Match: 條件も滿たさない。
-         ifMatch <- getHeader "If-Match"
-         when (ifMatch /= Nothing)
-                  $ abort PreconditionFailed [] msgM
+         ifMatch ← getHeader "If-Match"
+         when (ifMatch ≢ Nothing)
+             $ abort PreconditionFailed [] msgM
 
          driftTo GettingBody
 
@@ -457,81 +594,68 @@ foundNoEntity msgM
 -- no body, 'input' returns an empty string.
 --
 -- @limit@ may be less than or equal to zero. In this case, the
--- default limitation value
--- ('Network.HTTP.Lucu.Config.cnfMaxEntityLength') is used. See
+-- default limitation value ('cnfMaxEntityLength') is used. See
 -- 'defaultLimit'.
 --
--- Note that 'inputBS' is more efficient than 'input' so you should
--- use it whenever possible.
-input :: Int -> Resource String
-input limit = limit `seq`
-              inputBS limit >>= return . B.unpack
-
-
--- | This is mostly the same as 'input' but is more
--- efficient. 'inputBS' returns a lazy ByteString but it's not really
--- lazy: reading from the socket just happens at the computation of
--- 'inputBS', not at the lazy evaluation of the ByteString. The same
--- goes for 'inputChunkBS'.
-inputBS :: Int -> Resource ByteString
-inputBS limit
-    = limit `seq`
-      do driftTo GettingBody
-         itr     <- ask
-         hasBody <- liftIO $! atomically $! readItr itr itrRequestHasBody id
-         chunk   <- if hasBody then
-                        askForInput itr
-                    else
-                        do driftTo DecidingHeader
-                           return B.empty
+-- 'input' returns a 'Lazy.ByteString' but it's not really lazy:
+-- reading from the socket just happens at the computation of 'input',
+-- not at the evaluation of the 'Lazy.ByteString'. The same goes for
+-- 'inputChunk'.
+input ∷ Int → Resource Lazy.ByteString
+input limit
+    = do driftTo GettingBody
+         itr     ← getInteraction
+         chunk   ← if reqHasBody $ fromJust $ itrRequest itr then
+                       askForInput itr
+                   else
+                       do driftTo DecidingHeader
+                          return (∅)
          return chunk
     where
-      askForInput :: Interaction -> Resource ByteString
-      askForInput itr
-          = itr `seq`
-            do let defaultLimit = cnfMaxEntityLength $ itrConfig itr
-                   actualLimit  = if limit <= 0 then
-                                      defaultLimit
-                                  else
-                                      limit
-               when (actualLimit <= 0)
-                        $ fail ("inputBS: limit must be positive: " ++ show actualLimit)
+      askForInput ∷ Interaction → Resource Lazy.ByteString
+      askForInput (Interaction {..})
+          = do let confLimit   = cnfMaxEntityLength itrConfig
+                   actualLimit = if limit ≤ 0 then
+                                     confLimit
+                                 else
+                                     limit
+               when (actualLimit ≤ 0)
+                        $ fail ("inputLBS: limit must be positive: " ⧺ show actualLimit)
                -- Reader にリクエスト
-               liftIO $! atomically
-                          $! do chunkLen <- readItr itr itrReqChunkLength id
-                                writeItr itr itrWillReceiveBody True
-                                if fmap (> actualLimit) chunkLen == Just True then
-                                    -- 受信前から多過ぎる事が分かってゐる
-                                    tooLarge actualLimit
-                                  else
-                                    writeItr itr itrReqBodyWanted $ Just actualLimit
-               -- 應答を待つ。トランザクションを分けなければ當然デッドロック。
-               chunk <- liftIO $! atomically
-                        $! do chunk       <- readItr itr itrReceivedBody id
-                              chunkIsOver <- readItr itr itrReqChunkIsOver id
-                              if B.length chunk < fromIntegral actualLimit then
-                                  -- 要求された量に滿たなくて、まだ殘り
-                                  -- があるなら再試行。
-                                  unless chunkIsOver
-                                             $ retry
-                                else
-                                  -- 制限値一杯まで讀むやうに指示したの
-                                  -- にまだ殘ってゐるなら、それは多過ぎ
-                                  -- る。
-                                  unless chunkIsOver
-                                             $ tooLarge actualLimit
-                              -- 成功。itr 内にチャンクを置いたままにす
-                              -- るとメモリの無駄になるので除去。
-                              writeItr itr itrReceivedBody B.empty
-                              return chunk
+               liftIO $ atomically
+                      $ writeTVar itrReqBodyWanted actualLimit
+               -- 應答を待つ。トランザクションを分けなければ當然デッドロックする。
+               chunk ← liftIO $ atomically
+                       $ do chunkLen    ← readTVar itrReceivedBodyLen
+                            chunkIsOver ← readTVar itrReqChunkIsOver
+                            if chunkLen < actualLimit then
+                                -- 要求された量に滿たなくて、まだ殘りが
+                                -- あるなら再試行。
+                                unless chunkIsOver
+                                    $ retry
+                            else
+                                -- 制限値一杯まで讀むやうに指示したのに
+                                -- まだ殘ってゐるなら、それは多過ぎる。
+                                unless chunkIsOver
+                                    $ tooLarge actualLimit
+                            -- 成功。itr 内にチャンクを置いたままにする
+                            -- とメモリの無駄になるので除去。
+                            chunk ← seqToLBS <$> readTVar itrReceivedBody
+                            writeTVar itrReceivedBody    (∅)
+                            writeTVar itrReceivedBodyLen 0
+                            return chunk
+
                driftTo DecidingHeader
                return chunk
 
-      tooLarge :: Int -> STM ()
-      tooLarge lim = lim `seq`
-                     abortSTM RequestEntityTooLarge []
-                     $! Just ("Request body must be smaller than "
-                              ++ show lim ++ " bytes.")
+      tooLarge ∷ Int → STM ()
+      tooLarge lim = abortSTM RequestEntityTooLarge []
+                     (Just $ "Request body must be smaller than "
+                             ⊕ T.pack (show lim) ⊕ " bytes.")
+
+seqToLBS ∷ Seq ByteString → Lazy.ByteString
+{-# INLINE seqToLBS #-}
+seqToLBS = Lazy.fromChunks ∘ toList
          
 -- | Computation of @'inputChunk' limit@ attempts to read a part of
 -- request body up to @limit@ bytes. You can read any large request by
@@ -540,116 +664,129 @@ inputBS limit
 -- the 'Resource' transit to /Deciding Header/ state.
 --
 -- @limit@ may be less than or equal to zero. In this case, the
--- default limitation value
--- ('Network.HTTP.Lucu.Config.cnfMaxEntityLength') is used. See
+-- default limitation value ('cnfMaxEntityLength') is used. See
 -- 'defaultLimit'.
 --
--- Note that 'inputChunkBS' is more efficient than 'inputChunk' so you
+-- Note that 'inputChunkLBS' is more efficient than 'inputChunk' so you
 -- should use it whenever possible.
-inputChunk :: Int -> Resource String
-inputChunk limit = limit `seq`
-                   inputChunkBS limit >>= return . B.unpack
-
-
--- | This is mostly the same as 'inputChunk' but is more
--- efficient. See 'inputBS'.
-inputChunkBS :: Int -> Resource ByteString
-inputChunkBS limit
-    = limit `seq`
-      do driftTo GettingBody
-         itr <- ask
-         hasBody <- liftIO $ atomically $ readItr itr itrRequestHasBody id
-         chunk   <- if hasBody then
-                        askForInput itr
-                    else
-                        do driftTo DecidingHeader
-                           return B.empty
+inputChunk ∷ Int → Resource Lazy.ByteString
+inputChunk limit
+    = do driftTo GettingBody
+         itr     ← getInteraction
+         chunk   ← if reqHasBody $ fromJust $ itrRequest itr then
+                       askForInput itr
+                   else
+                       do driftTo DecidingHeader
+                          return (∅)
          return chunk
     where
-      askForInput :: Interaction -> Resource ByteString
-      askForInput itr
-          = itr `seq`
-            do let defaultLimit = cnfMaxEntityLength $! itrConfig itr
-                   actualLimit  = if limit < 0 then
-                                      defaultLimit
-                                  else
-                                      limit
-               when (actualLimit <= 0)
-                        $ fail ("inputChunkBS: limit must be positive: " ++ show actualLimit)
+      askForInput ∷ Interaction → Resource Lazy.ByteString
+      askForInput (Interaction {..})
+          = do let confLimit   = cnfMaxEntityLength itrConfig
+                   actualLimit = if limit < 0 then
+                                     confLimit
+                                 else
+                                     limit
+               when (actualLimit ≤ 0)
+                        $ fail ("inputChunkLBS: limit must be positive: " ++ show actualLimit)
                -- Reader にリクエスト
-               liftIO $! atomically
-                          $! do writeItr itr itrReqBodyWanted $! Just actualLimit
-                                writeItr itr itrWillReceiveBody True
+               liftIO $ atomically
+                      $ writeTVar itrReqBodyWanted actualLimit
                -- 應答を待つ。トランザクションを分けなければ當然デッドロック。
-               chunk <- liftIO $! atomically
-                        $ do chunk <- readItr itr itrReceivedBody id
-                             -- 要求された量に滿たなくて、まだ殘りがあ
-                             -- るなら再試行。
-                             when (B.length chunk < fromIntegral actualLimit)
-                                      $ do chunkIsOver <- readItr itr itrReqChunkIsOver id
-                                           unless chunkIsOver
-                                                      $ retry
-                             -- 成功
-                             writeItr itr itrReceivedBody B.empty
-                             return chunk
-               when (B.null chunk)
-                        $ driftTo DecidingHeader
+               chunk ← liftIO $ atomically
+                       $ do chunkLen ← readTVar itrReceivedBodyLen
+                            -- 要求された量に滿たなくて、まだ殘りがある
+                            -- なら再試行。
+                            when (chunkLen < actualLimit)
+                                $ do chunkIsOver ← readTVar itrReqChunkIsOver
+                                     unless chunkIsOver
+                                         $ retry
+                            -- 成功
+                            chunk ← seqToLBS <$> readTVar itrReceivedBody
+                            writeTVar itrReceivedBody    (∅)
+                            writeTVar itrReceivedBodyLen 0
+                            return chunk
+               when (Lazy.null chunk)
+                   $ driftTo DecidingHeader
                return chunk
 
 -- | Computation of @'inputForm' limit@ attempts to read the request
 -- body with 'input' and parse it as
--- application\/x-www-form-urlencoded. If the request header
--- \"Content-Type\" is not application\/x-www-form-urlencoded,
--- 'inputForm' makes 'Resource' abort with status \"415 Unsupported
--- Media Type\". If the request has no \"Content-Type\", it aborts
--- with \"400 Bad Request\".
+-- @application\/x-www-form-urlencoded@ or @multipart\/form-data@. If
+-- the request header \"Content-Type\" is neither of them, 'inputForm'
+-- makes 'Resource' abort with status \"415 Unsupported Media
+-- Type\". If the request has no \"Content-Type\", it aborts with
+-- \"400 Bad Request\".
 --
--- This action should also support multipart\/form-data somehow, but
--- it is not (yet) done.
-inputForm :: Int -> Resource [(String, String)]
+-- Field names in @multipart\/form-data@ will be precisely decoded in
+-- accordance with RFC 2231. On the other hand,
+-- @application\/x-www-form-urlencoded@ says nothing about the
+-- encoding of field names, so they'll always be decoded in UTF-8.
+inputForm ∷ Int → Resource [(Text, FormData)]
 inputForm limit
-    = limit `seq` 
-      do cTypeM <- getContentType
+    = do cTypeM ← getContentType
          case cTypeM of
            Nothing
-               -> abort BadRequest [] (Just "Missing Content-Type")
+               → abort BadRequest [] (Just "Missing Content-Type")
            Just (MIMEType "application" "x-www-form-urlencoded" _)
-               -> readWWWFormURLEncoded
-           Just (MIMEType "multipart" "form-data" _)
-               -> readMultipartFormData
+               → readWWWFormURLEncoded
+           Just (MIMEType "multipart" "form-data" params)
+               → readMultipartFormData params
            Just cType
-               -> abort UnsupportedMediaType [] (Just $! "Unsupported media type: "
-                                                          ++ show cType)
+               → abort UnsupportedMediaType []
+                 $ Just
+                 $ A.toText
+                 $ A.fromAsciiBuilder
+                 $ A.toAsciiBuilder "Unsupported media type: "
+                 ⊕ printMIMEType cType
     where
       readWWWFormURLEncoded
-          = do src <- input limit
-               return $ parseWWWFormURLEncoded src
-
-      readMultipartFormData -- FIXME: 未對應
-          = abort UnsupportedMediaType []
-            (Just $! "Sorry, inputForm does not currently support multipart/form-data.")
-
--- | This is just a constant -1. It's better to say @'input'
+          = (map toPairWithFormData ∘ parseWWWFormURLEncoded)
+            <$>
+            (bsToAscii =≪ input limit)
+
+      bsToAscii bs
+          = case A.fromByteString (Strict.concat (Lazy.toChunks bs)) of
+              Just a  → return a
+              Nothing → abort BadRequest [] (Just "Malformed x-www-form-urlencoded")
+
+      readMultipartFormData params
+          = do case M.lookup "boundary" params of
+                 Nothing
+                     → abort BadRequest [] (Just "Missing boundary of multipart/form-data")
+                 Just boundary
+                     → do src ← input limit
+                          b   ← case A.fromText boundary of
+                                   Just b  → return b
+                                   Nothing → abort BadRequest []
+                                             (Just $ "Malformed boundary: " ⊕ boundary)
+                          case LP.parse (p b) src of
+                            LP.Done _ formList
+                                → return formList
+                            _   → abort BadRequest [] (Just "Unparsable multipart/form-data")
+          where
+            p b = do xs ← multipartFormP b
+                     P.endOfInput
+                     return xs
+
+-- | This is just a constant @-1@. It's better to say @'input'
 -- 'defaultLimit'@ than to say @'input' (-1)@ but these are exactly
 -- the same.
-defaultLimit :: Int
+defaultLimit ∷ Int
 defaultLimit = (-1)
 
 
-
 {- DecidingHeader 時に使用するアクション群 -}
 
 -- | Set the response status code. If you omit to compute this action,
 -- the status code will be defaulted to \"200 OK\".
-setStatus :: StatusCode -> Resource ()
-setStatus code
-    = code `seq`
-      do driftTo DecidingHeader
-         itr <- ask
-         liftIO $! atomically $! updateItr itr itrResponse
-                    $! \ res -> res {
-                                  resStatus = code
-                                }
+setStatus ∷ StatusCode → Resource ()
+setStatus sc
+    = do driftTo DecidingHeader
+         itr ← getInteraction
+         liftIO
+             $ atomically
+             $ setResponseStatus itr sc
 
 -- | Set a value of given resource header. Comparison of header name
 -- is case-insensitive. Note that this action is not intended to be
@@ -665,120 +802,112 @@ setStatus code
 -- 20 bytes long. In this case the client shall only accept the first
 -- 10 bytes of response body and thinks that the residual 10 bytes is
 -- a part of header of the next response.
-setHeader :: String -> String -> Resource ()
+setHeader ∷ CIAscii → Ascii → Resource ()
 setHeader name value
-    = name `seq` value `seq`
-      driftTo DecidingHeader >> setHeader' name value
-         
+    = driftTo DecidingHeader ≫ setHeader' name value
 
-setHeader' :: String -> String -> Resource ()
+setHeader' ∷ CIAscii → Ascii → Resource ()
 setHeader' name value
-    = name `seq` value `seq`
-      do itr <- ask
+    = do itr ← getInteraction
          liftIO $ atomically
-                    $ updateItr itr itrResponse
-                          $ H.setHeader name value
+                $ do res ← readTVar $ itrResponse itr
+                     let res' = H.setHeader name value res
+                     writeTVar (itrResponse itr) res'
 
 -- | Computation of @'redirect' code uri@ sets the response status to
--- @code@ and \"Location\" header to @uri@. @code@ must satisfy
--- 'Network.HTTP.Lucu.Response.isRedirection' or it causes an error.
-redirect :: StatusCode -> URI -> Resource ()
+-- @code@ and \"Location\" header to @uri@. The @code@ must satisfy
+-- 'isRedirection' or it causes an error.
+redirect ∷ StatusCode → URI → Resource ()
 redirect code uri
-    = code `seq` uri `seq`
-      do when (code == NotModified || not (isRedirection code))
-                  $ abort InternalServerError []
-                        $! Just ("Attempted to redirect with status " ++ show code)
+    = do when (code ≡ NotModified ∨ not (isRedirection code))
+             $ abort InternalServerError []
+             $ Just
+             $ A.toText
+             $ A.fromAsciiBuilder
+             $ A.toAsciiBuilder "Attempted to redirect with status "
+             ⊕ printStatusCode code
          setStatus code
          setLocation uri
-{-# INLINE redirect #-}
-
 
 -- | Computation of @'setContentType' mType@ sets the response header
 -- \"Content-Type\" to @mType@.
-setContentType :: MIMEType -> Resource ()
-setContentType mType
-    = setHeader "Content-Type" $! show mType
+setContentType ∷ MIMEType → Resource ()
+setContentType
+    = setHeader "Content-Type" ∘ A.fromAsciiBuilder ∘ printMIMEType
 
 -- | Computation of @'setLocation' uri@ sets the response header
 -- \"Location\" to @uri@.
-setLocation :: URI -> Resource ()
+setLocation ∷ URI → Resource ()
 setLocation uri
-    = setHeader "Location" $ uriToString id uri $ ""
+    = case A.fromChars uriStr of
+        Just a  → setHeader "Location" a
+        Nothing → abort InternalServerError []
+                  (Just $ "Malformed URI: " ⊕ T.pack uriStr)
+    where
+      uriStr = uriToString id uri ""
+
+-- |Computation of @'setContentEncoding' codings@ sets the response
+-- header \"Content-Encoding\" to @codings@.
+setContentEncoding ∷ [CIAscii] → Resource ()
+setContentEncoding codings
+    = do ver ← getRequestVersion
+         tr  ← case ver of
+                  HttpVersion 1 0 → return (toAB ∘ unnormalizeCoding)
+                  HttpVersion 1 1 → return toAB
+                  _               → abort InternalServerError []
+                                    (Just "setContentEncoding: Unknown HTTP version")
+         setHeader "Content-Encoding"
+                   (A.fromAsciiBuilder $ joinWith ", " $ map tr codings)
+    where
+      toAB = A.toAsciiBuilder ∘ A.fromCIAscii
+
+-- |Computation of @'setWWWAuthenticate' challenge@ sets the response
+-- header \"WWW-Authenticate\" to @challenge@.
+setWWWAuthenticate ∷ AuthChallenge → Resource ()
+setWWWAuthenticate challenge
+    = setHeader "WWW-Authenticate" (printAuthChallenge challenge)
 
 
 {- DecidingBody 時に使用するアクション群 -}
 
--- | Computation of @'output' str@ writes @str@ as a response body,
--- and then make the 'Resource' transit to /Done/ state. It is safe to
--- apply 'output' to an infinite string, such as a lazy stream of
--- \/dev\/random.
---
--- Note that 'outputBS' is more efficient than 'output' so you should
--- use it whenever possible.
-output :: String -> Resource ()
-output str = outputBS $! B.pack str
+-- | Write a 'Lazy.ByteString' to the response body, and then transit
+-- to the /Done/ state. It is safe to apply 'output' to an infinite
+-- string, such as the lazy stream of \/dev\/random.
+output ∷ Lazy.ByteString → Resource ()
 {-# INLINE output #-}
-
--- | This is mostly the same as 'output' but is more efficient.
-outputBS :: ByteString -> Resource ()
-outputBS str = do outputChunkBS str
-                  driftTo Done
-{-# INLINE outputBS #-}
-
--- | Computation of @'outputChunk' str@ writes @str@ as a part of
--- response body. You can compute this action multiple times to write
--- a body little at a time. It is safe to apply 'outputChunk' to an
--- infinite string.
---
--- Note that 'outputChunkBS' is more efficient than 'outputChunk' so
--- you should use it whenever possible.
-outputChunk :: String -> Resource ()
-outputChunk str = outputChunkBS $! B.pack str
-{-# INLINE outputChunk #-}
-
--- | This is mostly the same as 'outputChunk' but is more efficient.
-outputChunkBS :: ByteString -> Resource ()
-outputChunkBS str
-    = str `seq`
-      do driftTo DecidingBody
-         itr <- ask
+output str = outputChunk str *> driftTo Done
+
+-- | Write a 'Lazy.ByteString' to the response body. This action can
+-- be repeated as many times as you want. It is safe to apply
+-- 'outputChunk' to an infinite string.
+outputChunk ∷ Lazy.ByteString → Resource ()
+outputChunk wholeChunk
+    = do driftTo DecidingBody
+         itr ← getInteraction
          
          let limit = cnfMaxOutputChunkLength $ itrConfig itr
-         when (limit <= 0)
-                  $ fail ("cnfMaxOutputChunkLength must be positive: "
-                          ++ show limit)
-
-         discardBody <- liftIO $ atomically $
-                        readItr itr itrWillDiscardBody id
+         when (limit ≤ 0)
+             $ abort InternalServerError []
+               (Just $ "cnfMaxOutputChunkLength must be positive: " ⊕ T.pack (show limit))
 
+         discardBody ← liftIO $ atomically $ readTVar $ itrWillDiscardBody itr
          unless (discardBody)
-                    $ sendChunks str limit
+             $ sendChunks itr wholeChunk limit
 
-         unless (B.null str)
-                    $ liftIO $ atomically $
-                      writeItr itr itrBodyIsNull False
+         unless (Lazy.null wholeChunk)
+             $ liftIO $ atomically $
+               writeTVar (itrSentNoBodySoFar itr) False
     where
-      {- チャンクの大きさは Config で制限されてゐる。もし例へば
-         /dev/zero を B.readFile して作った ByteString をそのまま
-         ResponseWriter に渡したりすると大變な事が起こる。何故なら
-         ResponseWriter はTransfer-Encoding: chunked の時、ヘッダを書く
-         爲にチャンクの大きさを測るから、その時に起こるであらう事は言ふ
-         までも無い。 -}
-      sendChunks :: ByteString -> Int -> Resource ()
-      sendChunks str limit
-          | B.null str = return ()
-          | otherwise  = do let (chunk, remaining) = B.splitAt (fromIntegral limit) str
-                            itr <- ask
-                            liftIO $ atomically $ 
-                                   do buf <- readItr itr itrBodyToSend id
-                                      if B.null buf then
-                                          -- バッファが消化された
-                                          writeItr itr itrBodyToSend chunk
-                                        else
-                                          -- 消化されるのを待つ
-                                          retry
-                            -- 殘りのチャンクについて繰り返す
-                            sendChunks remaining limit
+      sendChunks ∷ Interaction → Lazy.ByteString → Int → Resource ()
+      sendChunks itr@(Interaction {..}) str limit
+          | Lazy.null str = return ()
+          | otherwise     = do let (chunk, remaining) = Lazy.splitAt (fromIntegral limit) str
+                               liftIO $ atomically
+                                      $ putTMVar itrBodyToSend (chunkToBuilder chunk)
+                               sendChunks itr remaining limit
+
+      chunkToBuilder ∷ Lazy.ByteString → Builder
+      chunkToBuilder = mconcat ∘ map BB.fromByteString ∘ Lazy.toChunks
 
 {-
 
@@ -799,41 +928,34 @@ outputChunkBS str
 
 -}
 
-driftTo :: InteractionState -> Resource ()
+driftTo ∷ InteractionState → Resource ()
 driftTo newState
-    = newState `seq`
-      do itr <- ask
-         liftIO $ atomically $ do oldState <- readItr itr itrState id
-                                  if newState < oldState then
-                                      throwStateError oldState newState
-                                    else
-                                      do let a = [oldState .. newState]
-                                             b = tail a
-                                             c = zip a b
-                                         mapM_ (uncurry $ drift itr) c
-                                         writeItr itr itrState newState
+    = do itr ← getInteraction
+         liftIO $ atomically
+                $ do oldState ← readTVar $ itrState itr
+                     if newState < oldState then
+                         throwStateError oldState newState
+                     else
+                         do let a = [oldState .. newState]
+                                b = tail a
+                                c = zip a b
+                            mapM_ (uncurry $ drift itr) c
+                            writeTVar (itrState itr) newState
     where
-      throwStateError :: Monad m => InteractionState -> InteractionState -> m a
-
+      throwStateError ∷ Monad m ⇒ InteractionState → InteractionState → m a
       throwStateError Done DecidingBody
           = fail "It makes no sense to output something after finishing to output."
-
       throwStateError old new
-          = fail ("state error: " ++ show old ++ " ==> " ++ show new)
-
-
-      drift :: Interaction -> InteractionState -> InteractionState -> STM ()
-
-      drift itr GettingBody _
-          = writeItr itr itrReqBodyWasteAll True
+          = fail ("state error: " ⧺ show old ⧺ " ==> " ⧺ show new)
 
+      drift ∷ Interaction → InteractionState → InteractionState → STM ()
+      drift (Interaction {..}) GettingBody _
+          = writeTVar itrReqBodyWasteAll True
       drift itr DecidingHeader _
           = postprocess itr
-
-      drift itr _ Done
-          = do bodyIsNull <- readItr itr itrBodyIsNull id
+      drift itr@(Interaction {..}) _ Done
+          = do bodyIsNull ← readTVar itrSentNoBodySoFar
                when bodyIsNull
-                        $ writeDefaultPage itr
-
+                   $ writeDefaultPage itr
       drift _ _ _
           = return ()