Skip to content

Commit 992fb27

Browse files
somecookiesquid-anubis
authored andcommitted
Remove unused Ftp::Gateway::proxy_host (#2440)
The data member is effectively unused since inception in 1997 commit 3fdadc7 and is in the way of other FTP fixes. This is a Measurement Factory project.
1 parent 0a261cb commit 992fb27

1 file changed

Lines changed: 1 addition & 6 deletions

File tree

src/clients/FtpGateway.cc

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ class Gateway : public Ftp::Client
115115
char *filepath;
116116
char *dirpath;
117117
int64_t restart_offset;
118-
char *proxy_host;
119118
size_t list_width;
120119
String cwd_message;
121120
char *old_filepath;
@@ -341,7 +340,6 @@ Ftp::Gateway::Gateway(FwdState *fwdState):
341340
filepath(nullptr),
342341
dirpath(nullptr),
343342
restart_offset(0),
344-
proxy_host(nullptr),
345343
list_width(0),
346344
old_filepath(nullptr),
347345
typecode('\0')
@@ -1291,10 +1289,7 @@ ftpSendUser(Ftp::Gateway * ftpState)
12911289
if (!ftpState || !ftpState->haveControlChannel("ftpSendUser"))
12921290
return;
12931291

1294-
if (ftpState->proxy_host != nullptr)
1295-
snprintf(cbuf, CTRL_BUFLEN, "USER %s@%s\r\n", ftpState->user, ftpState->request->url.host());
1296-
else
1297-
snprintf(cbuf, CTRL_BUFLEN, "USER %s\r\n", ftpState->user);
1292+
snprintf(cbuf, CTRL_BUFLEN, "USER %s\r\n", ftpState->user);
12981293

12991294
ftpState->writeCommand(cbuf);
13001295

0 commit comments

Comments
 (0)