Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 04:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 477635 - 'blind' download ftp folder inaccessible since 3.0.5 ~ 3.0.6 - 550 PWD

Browse Source
This commit is contained in:
Michal Novotny 2011-11-23 02:11:39 +01:00
parent 8064e5a172
commit 339a6fdd59
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
netwerk/protocol/ftp/nsFtpConnectionThread.cpp
View File

@ -107,6 +107,7 @@ nsFtpState::nsFtpState()
, mStorReplyReceived(false)
, mInternalError(NS_OK)
, mReconnectAndLoginAgain(false)
, mCacheConnection(true)
, mPort(21)
, mAddressChecked(false)
, mServerIsIPv6(false)
@ -853,8 +854,11 @@ nsFtpState::S_pwd() {
FTP_STATE
nsFtpState::R_pwd() {
if (mResponseCode/100 != 2)
return FTP_ERROR;
// Error response to PWD command isn't fatal, but don't cache the connection
// if CWD command is sent since correct mPwd is needed for further requests.
if (mResponseCode/100 != 2)
return FTP_S_TYPE;
nsCAutoString respStr(mResponseMsg);
PRInt32 pos = respStr.FindChar('"');
if (pos > -1) {
@ -975,6 +979,10 @@ nsFtpState::R_type() {
nsresult
nsFtpState::S_cwd() {
// Don't cache the connection if PWD command failed
if (mPwd.IsEmpty())
mCacheConnection = PR_FALSE;
nsCAutoString cwdStr;
if (mAction != PUT)
cwdStr = mPath;
@ -1815,7 +1823,8 @@ nsFtpState::KillControlConnection()
if (NS_SUCCEEDED(mInternalError) &&
NS_SUCCEEDED(mControlStatus) &&
mControlConnection->IsAlive()) {
mControlConnection->IsAlive() &&
mCacheConnection) {
LOG_ALWAYS(("FTP:(%p) caching CC(%p)", this, mControlConnection.get()));

1
netwerk/protocol/ftp/nsFtpConnectionThread.h
View File

@ -269,6 +269,7 @@ private:
// completion status from server
nsresult mInternalError; // represents internal state errors
bool mReconnectAndLoginAgain;
bool mCacheConnection;
// ****** URI vars
PRInt32 mPort; // the port to connect to