Fixed leftover issues with reverting RequestFlags getters/setters.

diff --git a/src/RequestFlags.cc b/src/RequestFlags.cc
index 51dee30b1f9d9fe14b70d1eff0c159278ca99046..630a38290ccdb8f6acc9d793e475b3f32a4bafb7 100644 (file)
--- 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 cf62bbf0c861118ee9d166b3f361c9f288f37a3c..cbcea7e97de39fb70c4dd8724de9da99bd1b41fe 100644 (file)
--- 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 24337153f2bdd4fec95348a9e62b5d2955104d90..22fd330aa9f3b9a725be1d66782e3d30611140c1 100644 (file)
--- 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 f1788caf398aeb0cd278d304caed1a327eb5f6d5..eb3be5c3e42f9075403af49c0b2760fcce9279bb 100644 (file)
--- 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 1e4ed0c30b505efe1fbe27616957c4e814d5ca07..84fdce32f6c2970a1d6e9b4487db4395a9dd7dd2 100644 (file)
--- 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;
         }
     }