From: Andrew Novikov <as.asaw@gmail.com>
Date: Sun, 9 Jul 2023 02:05:56 +0000 (+0000)
Subject: Bug 5187: Work around REQMOD satisfaction regression (#1400)
X-Git-Tag: SQUID_7_0_1~402
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3f267b93c76a07584efaaa85353cdbb8c0a203c7;p=thirdparty%2Fsquid.git

Bug 5187: Work around REQMOD satisfaction regression (#1400)

Commit ba3fe8d broke ICAP REQMOD satisfaction transactions. In some
cases, this workaround may resurrect Squid Bug 5187. Triage available at
https://bugs.squid-cache.org/show_bug.cgi?id=5187#c6
---

diff --git a/src/client_side_request.cc b/src/client_side_request.cc
index ce9cb1af33..527c26116d 100644
--- a/src/client_side_request.cc
+++ b/src/client_side_request.cc
@@ -2054,8 +2054,13 @@ ClientHttpRequest::noteMoreBodyDataAvailable(BodyPipe::Pointer)
         bpc.checkIn();
     }
 
-    if (adaptedBodySource->exhausted())
+    if (adaptedBodySource->exhausted()) {
+        // XXX: Setting receivedWholeAdaptedReply here is a workaround for a
+        // regression, as described in https://bugs.squid-cache.org/show_bug.cgi?id=5187#c6
+        receivedWholeAdaptedReply = true;
+        debugs(85, DBG_IMPORTANT, "WARNING: Squid bug 5187 workaround triggered");
         endRequestSatisfaction();
+    }
     // else wait for more body data
 }