X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=Lucu.git;a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FInteraction.hs;h=f57a474f4884f388ecfe38be3f51e5edbba5a9ca;hp=4d153d14e579df2a5d8bc9e410b0e53054f8db0e;hb=7843dbf537dfefa583a8ee55b2a31a5e8a9c7c37;hpb=1f0a19cbad7c4b64a773d7f1c1ae9180448624e6

diff --git a/Network/HTTP/Lucu/Interaction.hs b/Network/HTTP/Lucu/Interaction.hs
index 4d153d1..f57a474 100644
--- a/Network/HTTP/Lucu/Interaction.hs
+++ b/Network/HTTP/Lucu/Interaction.hs
@@ -7,7 +7,7 @@ module Network.HTTP.Lucu.Interaction
     ( Interaction(..)
     , InteractionState(..)
     , InteractionQueue
-    , GetBodyRequest(..)
+    , ReceiveBodyRequest(..)
     , newInteractionQueue
     , newInteraction
 
@@ -40,8 +40,8 @@ data Interaction = Interaction {
     , itrExpectedContinue  ∷ !(Maybe Bool)
     , itrReqBodyLength     ∷ !(Maybe RequestBodyLength)
 
-    , itrGetBodyRequest    ∷ !(TMVar GetBodyRequest)
-    , itrGotBody           ∷ !(TMVar Strict.ByteString)
+    , itrReceiveBodyReq    ∷ !(TMVar ReceiveBodyRequest)
+    , itrReceivedBody      ∷ !(TMVar Strict.ByteString)
 
     , itrResponse          ∷ !(TVar Response)
     , itrWillChunkBody     ∷ !(TVar Bool)
@@ -57,16 +57,16 @@ data Interaction = Interaction {
 -- initial state.
 data InteractionState
     = ExaminingRequest
-    | GettingBody
+    | ReceivingBody
     | DecidingHeader
-    | DecidingBody
+    | SendingBody
     | Done
     deriving (Show, Eq, Ord, Enum)
 
 type InteractionQueue = TVar (Seq Interaction)
 
-data GetBodyRequest
-    = GetBody !Int -- ^ Maximum number of bytes.
+data ReceiveBodyRequest
+    = ReceiveBody !Int -- ^ Maximum number of octets to receive.
     | WasteAll
     deriving (Show, Eq)
 
@@ -87,8 +87,8 @@ newInteraction conf@(Config {..}) port addr cert request
                    , resHeaders = (∅)
                    }
 
-         getBodyRequest   ← newEmptyTMVarIO
-         gotBody          ← newEmptyTMVarIO
+         receiveBodyReq   ← newEmptyTMVarIO
+         receivedBody     ← newEmptyTMVarIO
 
          response         ← newTVarIO res
          willChunkBody    ← newTVarIO False
@@ -110,8 +110,8 @@ newInteraction conf@(Config {..}) port addr cert request
                     , itrExpectedContinue = arExpectedContinue ar
                     , itrReqBodyLength    = arReqBodyLength    ar
 
-                    , itrGetBodyRequest   = getBodyRequest
-                    , itrGotBody          = gotBody
+                    , itrReceiveBodyReq   = receiveBodyReq
+                    , itrReceivedBody     = receivedBody
 
                     , itrResponse         = response
                     , itrWillChunkBody    = willChunkBody