From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Wed, 19 Sep 2012 09:24:34 +0000 (+0200)
Subject: Fixed leftover issues with reverting RequestFlags getters/setters.
X-Git-Tag: SQUID_3_3_0_1~33^2~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42e3ce760ea2c33fb2a0b2d7eba19d628486d8e4;p=thirdparty%2Fsquid.git

Fixed leftover issues with reverting RequestFlags getters/setters.
---

diff --git a/src/RequestFlags.cc b/src/RequestFlags.cc
index 51dee30b1f..630a38290c 100644
--- a/src/RequestFlags.cc
+++ b/src/RequestFlags.cc
@@ -31,60 +31,8 @@
  */
 
 #include "squid.h"
-#include "Debug.h"
 #include "RequestFlags.h"
 
-// TODO: move to .cci
-/* RequestFlags */
-bool
-RequestFlags::resetTCP() const
-{
-    return resetTCP_;
-}
-
-void
-RequestFlags::setResetTCP()
-{
-    debugs(73, 9, HERE);
-    resetTCP_ = true;
-}
-
-void
-RequestFlags::clearResetTCP()
-{
-    debugs(73, 9, HERE);
-    resetTCP_ = false;
-}
-
-void
-RequestFlags::destinationIPLookupCompleted()
-{
-    destinationIPLookedUp_ = true;
-}
-
-bool
-RequestFlags::destinationIPLookedUp() const
-{
-    return destinationIPLookedUp_;
-}
-
-bool
-RequestFlags::isRanged() const
-{
-    return isRanged_;
-}
-
-void
-RequestFlags::setRanged()
-{
-    isRanged_ = true;
-}
-
-void
-RequestFlags::clearRanged()
-{
-    isRanged_ = false;
-}
 
 RequestFlags
 RequestFlags::cloneAdaptationImmune() const
diff --git a/src/client_side.cc b/src/client_side.cc
index cf62bbf0c8..cbcea7e97d 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -2652,7 +2652,7 @@ clientProcessRequest(ConnStateData *conn, HttpParser *hp, ClientSocketContext *c
     request->clientConnectionManager = conn;
 
     request->flags.accelerated = http->flags.accel;
-    request->flags.setSslBumped_=conn->switchedToHttps();
+    request->flags.sslBumped_=conn->switchedToHttps();
     request->flags.canRePin = request->flags.sslBumped_ && conn->pinning.pinned;
     request->flags.ignore_cc = conn->port->ignore_cc;
     // TODO: decouple http->flags.accel from request->flags.sslBumped
diff --git a/src/client_side.h b/src/client_side.h
index 24337153f2..22fd330aa9 100644
--- a/src/client_side.h
+++ b/src/client_side.h
@@ -53,6 +53,9 @@ class ConnStateData;
 class ClientHttpRequest;
 class clientStreamNode;
 class ChunkedCodingParser;
+namespace AnyP {
+    class PortCfg;
+} // namespace Anyp
 
 /**
  * Badly named.
diff --git a/src/client_side_request.cc b/src/client_side_request.cc
index f1788caf39..eb3be5c3e4 100644
--- a/src/client_side_request.cc
+++ b/src/client_side_request.cc
@@ -810,7 +810,7 @@ ClientRequestContext::clientAccessCheckDone(const allow_t &answer)
 
         if (auth_challenge) {
 #if USE_AUTH
-            if (http->request->flags.sslBumped) {
+            if (http->request->flags.sslBumped_) {
                 /*SSL Bumped request, authentication is not possible*/
                 status = HTTP_FORBIDDEN;
             } else if (!http->flags.accel) {
diff --git a/src/errorpage.cc b/src/errorpage.cc
index 1e4ed0c30b..84fdce32f6 100644
--- a/src/errorpage.cc
+++ b/src/errorpage.cc
@@ -631,7 +631,7 @@ errorAppendEntry(StoreEntry * entry, ErrorState * err)
     if (err->page_id == TCP_RESET) {
         if (err->request) {
             debugs(4, 2, "RSTing this reply");
-            err->request->flags.setResetTCP_=true;
+            err->request->flags.resetTCP_=true;
         }
     }