Merge branch 'R_10_00' of http://10.65.20.17:7990/scm/campo/campo into R_10_00
This commit is contained in:
commit
36c68924b1
@ -1182,9 +1182,6 @@ bool TSocketClient::FtpSendFile(CONNID id, const char* remote, const char* local
|
|||||||
if (!ReadLine(id, response)) // 220 Welcome
|
if (!ReadLine(id, response)) // 220 Welcome
|
||||||
return ok;
|
return ok;
|
||||||
|
|
||||||
// Possono esserci due messaggi di benvenuto
|
|
||||||
ReadLine(id, response);
|
|
||||||
|
|
||||||
TSocket_connection& conn = *(TSocket_connection*)GetConnection(id);
|
TSocket_connection& conn = *(TSocket_connection*)GetConnection(id);
|
||||||
if (user==NULL || !*user)
|
if (user==NULL || !*user)
|
||||||
user = "anonimous";
|
user = "anonimous";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user