From: Dmitry Kurochkin <dmitry.kurochkin@measurement-factory.com>
Date: Tue, 16 Apr 2013 18:21:40 +0000 (+0400)
Subject: Ftp gateway: remove ClientHttpRequest::flags::ftp.
X-Git-Tag: SQUID_3_5_0_1~117^2~72
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d4c86079eeb5f277e7026cd171edcdc3a24c5a9;p=thirdparty%2Fsquid.git

Ftp gateway: remove ClientHttpRequest::flags::ftp.

Use ConnStateData::isFtp instead.
---

diff --git a/src/client_side.cc b/src/client_side.cc
index 5067d9226d..b7705f3432 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -428,7 +428,7 @@ ClientSocketContext::writeControlMsg(HttpControlMsg &msg)
     AsyncCall::Pointer call = commCbCall(33, 5, "ClientSocketContext::wroteControlMsg",
                                          CommIoCbPtrFun(&WroteControlMsg, this));
 
-    if (http->flags.ftp) {
+    if (getConn()->isFtp) {
         FtpWriteForwardedReply(this, rep.getRaw(), call);
         return;
     }
@@ -4897,7 +4897,6 @@ FtpParseRequest(ConnStateData *connState, HttpRequestMethod *method_p, Http::Pro
     http->request = request;
     HTTPMSGLOCK(http->request);
     http->req_sz = eor - connState->in.buf + 1;
-    http->flags.ftp = true;
     http->uri = xstrdup(connState->ftp.uri.termedBuf());
 
     ClientSocketContext *const result =
diff --git a/src/client_side_request.h b/src/client_side_request.h
index 9c7d58f62c..eaa5f9211e 100644
--- a/src/client_side_request.h
+++ b/src/client_side_request.h
@@ -124,7 +124,6 @@ public:
         bool internal;
         bool done_copying;
         bool purging;
-        bool ftp;
     } flags;
 
     struct {