Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 14:22:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 127003 - topcrash fix; make sure OnStart is always called on the real

Browse Source 
data connection, before we send data to the listener.
r=dougt, sr=darin, a=dbaron
This commit is contained in:
bbaetz%student.usyd.edu.au 2002-03-08 22:27:50 +00:00
parent 440e8916b3
commit 0b39d813d3
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp
View File

@ -285,6 +285,7 @@ DataRequestForwarder::RetryConnection()
PR_LOG(gFTPLog, PR_LOG_DEBUG, ("(%x) DataRequestForwarder RetryConnection \n", this));
mRetrying = PR_TRUE;
mDelayedOnStartFired = PR_FALSE;
}
NS_IMETHODIMP
@ -1481,8 +1482,14 @@ nsFtpState::S_list() {
FTP_STATE
nsFtpState::R_list() {
if (mResponseCode/100 == 1)
if (mResponseCode/100 == 1) {
nsresult rv = mDPipeRequest->Resume();
if (NS_FAILED(rv)) {
PR_LOG(gFTPLog, PR_LOG_DEBUG, ("(%x) dataPipe->Resume (rv=%x)\n", this, rv));
return FTP_ERROR;
}
return FTP_READ_BUF;
}
if (mResponseCode/100 == 2) {
//(DONE)
@ -1512,7 +1519,6 @@ nsFtpState::S_retr() {
FTP_STATE
nsFtpState::R_retr() {
if (mResponseCode/100 == 2) {
//(DONE)
mNextState = FTP_COMPLETE;
@ -1527,6 +1533,11 @@ nsFtpState::R_retr() {
(void)mCacheEntry->Doom();
mCacheEntry = nsnull;
}
nsresult rv = mDPipeRequest->Resume();
if (NS_FAILED(rv)) {
PR_LOG(gFTPLog, PR_LOG_DEBUG, ("(%x) dataPipe->Resume (rv=%x)\n", this, rv));
return FTP_ERROR;
}
return FTP_READ_BUF;
}
@ -1544,6 +1555,8 @@ nsFtpState::R_retr() {
if (st)
st->SetReuseConnection(PR_FALSE);
mDPipe = 0;
mDPipeRequest->Cancel(NS_OK);
mDPipeRequest = 0;
return FTP_S_PASV;
}
@ -1789,6 +1802,16 @@ nsFtpState::R_pasv() {
if (mRETRFailed)
return FTP_S_CWD;
// Suspend the read
// If we don't do this, then the remote server could close the connection
// before we get the error message, and then we process the onstop as if
// it was from the real data connection
rv = mDPipeRequest->Suspend();
if (NS_FAILED(rv)){
PR_LOG(gFTPLog, PR_LOG_DEBUG, ("(%x) dataPipe->Suspend failed (rv=%x)\n", this, rv));
return FTP_ERROR;
}
return FTP_S_SIZE;
}