зеркало из https://github.com/mozilla/gecko-dev.git
Removing carriage returns (^M) to fix build bustage on cement tinderbox (IRIX).
This commit is contained in:
Родитель
96e1422d5e
Коммит
31f5e71e87
|
@ -1230,24 +1230,24 @@ nsFtpState::R_syst() {
|
|||
}
|
||||
else
|
||||
{
|
||||
NS_ASSERTION(0, "Guessing FTP server type.");
|
||||
NS_ASSERTION(0, "Guessing FTP server type.");
|
||||
// No clue. We will just hope it is UNIX type server.
|
||||
// An assertion here indicates that we should be testing
|
||||
// for another substring
|
||||
// An assertion here indicates that we should be testing
|
||||
// for another substring
|
||||
mServerType = FTP_UNIX_TYPE;
|
||||
mList = PR_TRUE;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return FTP_S_PWD;
|
||||
}
|
||||
|
||||
if (mResponseCode/100 == 5) {
|
||||
// server didn't like the SYST command. Probably (500, 501, 502)
|
||||
// No clue. We will just hope it is UNIX type server.
|
||||
mServerType = FTP_UNIX_TYPE;
|
||||
mList = PR_TRUE;
|
||||
|
||||
return FTP_S_PWD;
|
||||
}
|
||||
|
||||
if (mResponseCode/100 == 5) {
|
||||
// server didn't like the SYST command. Probably (500, 501, 502)
|
||||
// No clue. We will just hope it is UNIX type server.
|
||||
mServerType = FTP_UNIX_TYPE;
|
||||
mList = PR_TRUE;
|
||||
|
||||
return FTP_S_PWD;
|
||||
}
|
||||
return FTP_ERROR;
|
||||
}
|
||||
|
@ -1469,11 +1469,11 @@ nsFtpState::S_list() {
|
|||
nsCOMPtr<nsIStreamListener> converter;
|
||||
|
||||
rv = BuildStreamConverter(getter_AddRefs(converter));
|
||||
if (NS_FAILED(rv)) {
|
||||
// clear mResponseMsg which is displayed to the user.
|
||||
// TODO: we should probably set this to something
|
||||
// meaningful.
|
||||
mResponseMsg = "";
|
||||
if (NS_FAILED(rv)) {
|
||||
// clear mResponseMsg which is displayed to the user.
|
||||
// TODO: we should probably set this to something
|
||||
// meaningful.
|
||||
mResponseMsg = "";
|
||||
return rv;
|
||||
}
|
||||
mDRequestForwarder->SetStreamListener(converter);
|
||||
|
|
Загрузка…
Ссылка в новой задаче