loader: merge status and header packets

We sent the two packets at the same time anyway.

(Status could have been sent earlier in some cases, but there is no
point - it's unused until after all headers have been received.)

1 files changed, 3 insertions, 8 deletions

diff --git a/src/local/pager.nim b/src/local/pager.nim
index 0e6a0fb7..4af351b6 100644
--- a/src/local/pager.nim
+++ b/src/local/pager.nim
@@ -78,14 +78,13 @@ type
     pasNormal, pasAlertOn, pasLoadInfo
 
   ContainerConnectionState = enum
-    ccsBeforeResult, ccsBeforeStatus, ccsBeforeHeaders
+    ccsBeforeResult, ccsBeforeStatus
 
   ConnectingContainer* = ref object of MapData
     state: ContainerConnectionState
     container: Container
     res: int
     outputId: int
-    status: uint16
 
   LineData = ref object of RootObj
 
@@ -2935,14 +2934,10 @@ proc handleRead(pager: Pager; item: ConnectingContainer) =
         pager.unregisterFd(int(item.stream.fd))
         stream.sclose()
   of ccsBeforeStatus:
-    stream.withPacketReader r:
-      r.sread(item.status)
-    inc item.state
-    # continue
-  of ccsBeforeHeaders:
     let response = newResponse(item.res, container.request, stream,
-      item.outputId, item.status)
+      item.outputId)
     stream.withPacketReader r:
+      r.sread(response.status)
       r.sread(response.headers)
     # done
     pager.loader.unset(item)