Merge branch 'R_10_00' of http://10.65.20.17:7990/scm/campo/campo into R_10_00

This commit is contained in:
Mattia Tollari 2018-10-23 10:22:00 +02:00
commit 36c68924b1

View File

@ -1182,9 +1182,6 @@ bool TSocketClient::FtpSendFile(CONNID id, const char* remote, const char* local
if (!ReadLine(id, response)) // 220 Welcome
return ok;
// Possono esserci due messaggi di benvenuto
ReadLine(id, response);
TSocket_connection& conn = *(TSocket_connection*)GetConnection(id);
if (user==NULL || !*user)
user = "anonimous";