From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Fri, 30 Jul 2021 21:32:58 +0000 (-0400)
Subject: fixup: Improved diff a little
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7f0308484b5b0e3267200137c169aa792f623b51;p=thirdparty%2Fsquid.git

fixup: Improved diff a little
---

diff --git a/src/FwdState.cc b/src/FwdState.cc
index 4e02a36ca7..0d328291d7 100644
--- a/src/FwdState.cc
+++ b/src/FwdState.cc
@@ -214,6 +214,17 @@ FwdState::stopAndDestroy(const char *reason)
     /* do not place any code here as this object may be gone by now */
 }
 
+/// Notify a pending subtask, if any, that we no longer need its help. We do not
+/// have to do this -- the subtask job will eventually end -- but ending it
+/// earlier reduces waste and may reduce DoS attack surface.
+void
+FwdState::cancelStep(const char *reason)
+{
+    tcpConnWait.cancel(reason);
+    encryptionWait.cancel(reason);
+    httpConnectWait.cancel(reason);
+}
+
 #if STRICT_ORIGINAL_DST
 /// bypasses peerSelect() when dealing with intercepted requests
 void
@@ -318,17 +329,6 @@ FwdState::~FwdState()
     debugs(17, 3, "FwdState destructed, this=" << this);
 }
 
-/// Notify a pending subtask, if any, that we no longer need its help. We do not
-/// have to do this -- the subtask job will eventually end -- but ending it
-/// earlier reduces waste and may reduce DoS attack surface.
-void
-FwdState::cancelStep(const char *reason)
-{
-    tcpConnWait.cancel(reason);
-    encryptionWait.cancel(reason);
-    httpConnectWait.cancel(reason);
-}
-
 /**
  * This is the entry point for client-side to start forwarding
  * a transaction.  It is a static method that may or may not