From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 15 Nov 2015 09:55:45 +0000 (-0800)
Subject: Use pipeline object for transaction accounting
X-Git-Tag: SQUID_4_0_3~5^2~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2e3f31e0249e10302a3a6a4044bbd0d5e0d3ad10;p=thirdparty%2Fsquid.git

Use pipeline object for transaction accounting
---

diff --git a/src/client_side.cc b/src/client_side.cc
index 29908e2f2f..d3ef7e95a8 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -2269,7 +2269,7 @@ ConnStateData::addContextToQueue(ClientSocketContext * context)
             S = &(*S)->next);
     *S = context;
 
-    ++nrequests;
+    ++pipeline.nrequests;
 }
 
 int
@@ -2430,7 +2430,7 @@ bool
 clientTunnelOnError(ConnStateData *conn, ClientSocketContext *context, HttpRequest *request, const HttpRequestMethod& method, err_type requestError, Http::StatusCode errStatusCode, const char *requestErrorBytes)
 {
     if (conn->port->flags.isIntercepted() &&
-            Config.accessList.on_unsupported_protocol && conn->nrequests <= 1) {
+            Config.accessList.on_unsupported_protocol && conn->pipeline.nrequests <= 1) {
         ACLFilledChecklist checklist(Config.accessList.on_unsupported_protocol, request, NULL);
         checklist.requestErrorType = requestError;
         checklist.src_addr = conn->clientConnection->remote;
@@ -3274,7 +3274,6 @@ ConnStateData::ConnStateData(const MasterXaction::Pointer &xact) :
     AsyncJob("ConnStateData"), // kids overwrite
     Server(xact),
     bodyParser(nullptr),
-    nrequests(0),
 #if USE_OPENSSL
     sslBumpMode(Ssl::bumpEnd),
 #endif
diff --git a/src/client_side.h b/src/client_side.h
index 72e2120cf5..953cd30633 100644
--- a/src/client_side.h
+++ b/src/client_side.h
@@ -230,7 +230,6 @@ public:
     ClientSocketContext::Pointer currentobject;
 
     Ip::Address log_addr;
-    int nrequests;
 
     struct {
         bool readMore; ///< needs comm_read (for this request or new requests)