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

Use ConnStateData::isFtp instead.

diff --git a/src/client_side.cc b/src/client_side.cc
index 5067d9226d2e6800ced8746e916c094aecd3af1f..b7705f3432817810b73a499f5952699cef1e96d4 100644 (file)
--- 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 9c7d58f62c62e9bd413dad2babb75d11fd173020..eaa5f9211e4b045ed4c2d10bb1d9cf5de3407465 100644 (file)
--- 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 {