Delete HalfClosedLocal

Network/HTTP2/Arch/Context.hs

@@ -163,20 +163,8 @@ halfClosedRemote ctx stream@Stream{streamState} = do
     traverse_ (closed ctx stream) closingCode
   where
     closeHalf :: StreamState -> (StreamState, Maybe ClosedCode)
-    closeHalf x@(Closed _)         = (x, Nothing)
-    closeHalf (HalfClosedLocal cc) = (Closed cc, Just cc)
-    closeHalf _                    = (HalfClosedRemote, Nothing)
-
-halfClosedLocal :: Context -> Stream -> ClosedCode -> IO ()
-halfClosedLocal ctx stream@Stream{streamState} cc = do
-    shouldFinalize <- atomicModifyIORef streamState closeHalf
-    when shouldFinalize $
-        closed ctx stream cc
-  where
-    closeHalf :: StreamState -> (StreamState, Bool)
-    closeHalf x@(Closed _)     = (x, False)
-    closeHalf HalfClosedRemote = (Closed cc, True)
-    closeHalf _                = (HalfClosedLocal cc, False)
+    closeHalf x@(Closed _) = (x, Nothing)
+    closeHalf _            = (HalfClosedRemote, Nothing)
 
 closed :: Context -> Stream -> ClosedCode -> IO ()
 closed ctx@Context{concurrency,streamTable} strm@Stream{streamNumber} cc = do

Network/HTTP2/Arch/Receiver.hs

@@ -382,18 +382,6 @@ stream FrameHeaders header@FrameHeader{flags,streamId} bs ctx (Open (Body q _ _
         -- we don't support continuation here.
         E.throwIO $ ConnectionErrorIsSent ProtocolError streamId "continuation in trailer is not supported"
 
--- ignore data-frame except for flow-control when we're done locally
-stream FrameData
-       FrameHeader{flags}
-       _bs
-       _ctx s@(HalfClosedLocal _)
-       _ = do
-    let endOfStream = testEndStream flags
-    if endOfStream then do
-        return HalfClosedRemote
-      else
-        return s
-
 -- Transition (stream4)
 stream FrameData
        header@FrameHeader{flags,payloadLength,streamId}

Network/HTTP2/Arch/Sender.hs

@@ -29,7 +29,6 @@ import Network.HTTP2.Arch.File
 import Network.HTTP2.Arch.HPACK
 import Network.HTTP2.Arch.Manager hiding (start)
 import Network.HTTP2.Arch.Queue
-import Network.HTTP2.Arch.Stream
 import Network.HTTP2.Arch.Types
 import Network.HTTP2.Arch.Window
 import Network.HTTP2.Frame
@@ -151,9 +150,6 @@ frameSender ctx@Context{outputQ,controlQ,encodeDynamicTable,outputBufferLimit}
         off <- flushIfNecessary off'
         case body of
             OutBodyNone -> do
-                -- halfClosedLocal calls closed which removes
-                -- the stream from stream table.
-                when (isServer ctx) $ halfClosedLocal ctx strm Finished
                 return off
             OutBodyFile (FileSpec path fileoff bytecount) -> do
                 (pread, sentinel') <- confPositionReadMaker path
@@ -193,17 +189,14 @@ frameSender ctx@Context{outputQ,controlQ,encodeDynamicTable,outputBufferLimit}
     ----------------------------------------------------------------
     outputOrEnqueueAgain :: Output Stream -> Offset -> IO Offset
     outputOrEnqueueAgain out@(Output strm _ otyp _ _) off = E.handle resetStream $ do
-        state <- readStreamState strm
-        if isHalfClosedLocal state then
-            return off
-          else case otyp of
-                 OWait wait -> do
-                     -- Checking if all push are done.
-                     forkAndEnqueueWhenReady wait outputQ out{outputType=OObj} mgr
-                     return off
-                 _ -> case mtbq of
-                        Just tbq -> checkStreaming tbq
-                        _        -> checkStreamWindowSize
+        case otyp of
+          OWait wait -> do
+              -- Checking if all push are done.
+              forkAndEnqueueWhenReady wait outputQ out{outputType=OObj} mgr
+              return off
+          _ -> case mtbq of
+                 Just tbq -> checkStreaming tbq
+                 _        -> checkStreamWindowSize
       where
         mtbq = outputStrmQ out
         checkStreaming tbq = do
@@ -288,7 +281,6 @@ frameSender ctx@Context{outputQ,controlQ,encodeDynamicTable,outputBufferLimit}
         fillFrameHeader FrameData datPayloadLen streamNumber flag buf
         off'' <- handleTrailers mtrailers off'
         void tell
-        when (isServer ctx) $ halfClosedLocal ctx strm Finished
         decreaseWindowSize ctx strm datPayloadLen
         if reqflush then do
             flushN off''

Network/HTTP2/Arch/Stream.hs

@@ -27,11 +27,6 @@ isHalfClosedRemote HalfClosedRemote = True
 isHalfClosedRemote (Closed _)       = True
 isHalfClosedRemote _                = False
 
-isHalfClosedLocal :: StreamState -> Bool
-isHalfClosedLocal (HalfClosedLocal _) = True
-isHalfClosedLocal (Closed _)       = True
-isHalfClosedLocal _                = False
-
 isClosed :: StreamState -> Bool
 isClosed Closed{} = True
 isClosed _        = False

Network/HTTP2/Arch/Types.hs

@@ -222,17 +222,15 @@ data StreamState =
     Idle
   | Open OpenState
   | HalfClosedRemote
-  | HalfClosedLocal ClosedCode
   | Closed ClosedCode
   | Reserved
 
 instance Show StreamState where
-    show Idle                = "Idle"
-    show Open{}              = "Open"
-    show HalfClosedRemote    = "HalfClosedRemote"
-    show (HalfClosedLocal e) = "HalfClosedLocal: " ++ show e
-    show (Closed e)          = "Closed: " ++ show e
-    show Reserved            = "Reserved"
+    show Idle             = "Idle"
+    show Open{}           = "Open"
+    show HalfClosedRemote = "HalfClosedRemote"
+    show (Closed e)       = "Closed: " ++ show e
+    show Reserved         = "Reserved"
 
 ----------------------------------------------------------------