Upgrade Http::Stream::DeferredParams::reply as well

squid-cache · Nov 16, 2024 · 900db9c · 900db9c
1 parent 05eaae3
commit 900db9c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/src/client_side.cc b/src/client_side.cc
@@ -880,7 +880,7 @@ ClientSocketContextPushDeferredIfNeeded(Http::StreamPointer deferredRequest, Con
         /** defer now. */
         clientSocketRecipient(deferredRequest->deferredparams.node,
                               deferredRequest->http,
-                              deferredRequest->deferredparams.rep,
+                              deferredRequest->deferredparams.reply.getRaw(),
                               deferredRequest->deferredparams.queuedBuffer);
     }
 

diff --git a/src/http/Stream.cc b/src/http/Stream.cc
@@ -33,7 +33,6 @@ Http::Stream::Stream(const Comm::ConnectionPointer &aConn, ClientHttpRequest *aR
     flags.deferred = 0;
     flags.parsed_ok = 0;
     deferredparams.node = nullptr;
-    deferredparams.rep = nullptr;
 }
 
 Http::Stream::~Stream()
@@ -554,13 +553,13 @@ Http::Stream::initiateClose(const char *reason)
 }
 
 void
-Http::Stream::deferRecipientForLater(clientStreamNode *node, HttpReply *rep, StoreIOBuffer receivedData)
+Http::Stream::deferRecipientForLater(clientStreamNode *node, const HttpReplyPointer &rep, StoreIOBuffer receivedData)
 {
     debugs(33, 2, "Deferring request " << http->uri);
     assert(flags.deferred == 0);
     flags.deferred = 1;
     deferredparams.node = node;
-    deferredparams.rep = rep;
+    deferredparams.reply = rep;
     deferredparams.queuedBuffer = receivedData;
 }
 

diff --git a/src/http/Stream.h b/src/http/Stream.h
@@ -124,7 +124,7 @@ class Stream : public RefCountable
     /// terminate due to a send/write error (may continue reading)
     void initiateClose(const char *reason);
 
-    void deferRecipientForLater(clientStreamNode *, HttpReply *, StoreIOBuffer receivedData);
+    void deferRecipientForLater(clientStreamNode *, const HttpReplyPointer &, StoreIOBuffer receivedData);
 
 public: // HTTP/1.x state data
 
@@ -149,7 +149,7 @@ class Stream : public RefCountable
 
     public:
         clientStreamNode *node;
-        HttpReply *rep;
+        HttpReplyPointer reply;
         StoreIOBuffer queuedBuffer;
     };
 

diff --git a/src/tests/stub_libhttp.cc b/src/tests/stub_libhttp.cc
@@ -121,6 +121,6 @@ ConnStateData *Stream::getConn() const STUB_RETVAL(nullptr)
 void Stream::noteIoError(const Error &, const LogTagsErrors &) STUB
 void Stream::finished() STUB
 void Stream::initiateClose(const char *) STUB
-void Stream::deferRecipientForLater(clientStreamNode *, HttpReply *, StoreIOBuffer) STUB
+void Stream::deferRecipientForLater(clientStreamNode *, const HttpReplyPointer &, StoreIOBuffer) STUB
 }