]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Remove last traces of ConnStateData::currentobject
authorAmos Jeffries <squid3@treenet.co.nz>
Sun, 15 Nov 2015 13:36:19 +0000 (05:36 -0800)
committerAmos Jeffries <squid3@treenet.co.nz>
Sun, 15 Nov 2015 13:36:19 +0000 (05:36 -0800)
src/client_side.cc
src/client_side.h

index f21760bad2de028d76ce235c0e5101f038f83dcd..a0b0b126a22f2e5d703841ad4a9e1fc95e5834f1 100644 (file)
@@ -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();
index 57f64ab51d7ae3c53c33accd25a4d5153caa035c..cc467358b60ac8b9de31dd6b20374c576adb478a 100644 (file)
@@ -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 {