From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 15 Nov 2015 13:36:19 +0000 (-0800)
Subject: Remove last traces of ConnStateData::currentobject
X-Git-Tag: SQUID_4_0_3~5^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=baa6929f2dc6f993ef67ed880063a9e5d32589cb;p=thirdparty%2Fsquid.git

Remove last traces of ConnStateData::currentobject
---

diff --git a/src/client_side.cc b/src/client_side.cc
index f21760bad2..a0b0b126a2 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -4099,8 +4099,8 @@ ConnStateData::httpsPeeked(Comm::ConnectionPointer serverConnection)
         debugs(33, 5, HERE << "Error while bumping: " << sslConnectHostOrIp);
 
         //  copy error detail from bump-server-first request to CONNECT request
-        if (currentobject != NULL && currentobject->http != NULL && currentobject->http->request)
-            currentobject->http->request->detailError(sslServerBump->request->errType, sslServerBump->request->errDetail);
+        if (!pipeline.empty() && pipeline.front()->http != nullptr && pipeline.front()->http->request)
+            pipeline.front()->http->request->detailError(sslServerBump->request->errType, sslServerBump->request->errDetail);
     }
 
     getSslContextStart();
diff --git a/src/client_side.h b/src/client_side.h
index 57f64ab51d..cc467358b6 100644
--- a/src/client_side.h
+++ b/src/client_side.h
@@ -219,12 +219,6 @@ public:
     void setAuth(const Auth::UserRequest::Pointer &aur, const char *cause);
 #endif
 
-    /**
-     * used by the owner of the connection, opaque otherwise
-     * TODO: generalise the connection owner concept.
-     */
-    ClientSocketContext::Pointer currentobject;
-
     Ip::Address log_addr;
 
     struct {