wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 406787 - Empty index shown after ftp error if you hit return in the URL Bar; r+sr=bzbarsky

Browse Source
This commit is contained in:
Michal Novotny 2008-09-07 15:48:40 +02:00
parent 86355cc4a3
commit 9d1b81f5cc
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1117,6 +1117,7 @@ nsFtpState::R_list() {
if (mResponseCode/100 == 2) {
//(DONE)
mNextState = FTP_COMPLETE;
mDoomCache = PR_FALSE;
return FTP_COMPLETE;
}
return FTP_ERROR;
@ -1946,6 +1947,7 @@ nsFtpState::OnCacheEntryAvailable(nsICacheEntryDescriptor *entry,
if (IsClosed())
return NS_OK;
mDoomCache = PR_TRUE;
mCacheEntry = entry;
if (CanReadCacheEntry() && ReadCacheEntry()) {
mState = FTP_READ_CACHE;
@ -2026,6 +2028,8 @@ nsFtpState::CloseWithStatus(nsresult status)
}
mDataStream = nsnull;
if (mDoomCache && mCacheEntry)
mCacheEntry->Doom();
mCacheEntry = nsnull;
return nsBaseContentStream::CloseWithStatus(status);
@ -2078,6 +2082,7 @@ nsFtpState::ReadCacheEntry()
if (HasPendingCallback())
mDataStream->AsyncWait(this, 0, 0, CallbackTarget());
mDoomCache = PR_FALSE;
return PR_TRUE;
}
@ -2135,8 +2140,10 @@ nsFtpState::CheckCache()
session->OpenCacheEntry(key, accessReq, PR_FALSE,
getter_AddRefs(mCacheEntry));
if (mCacheEntry)
if (mCacheEntry) {
mDoomCache = PR_TRUE;
return PR_FALSE; // great, we're ready to proceed!
}
nsresult rv = session->AsyncOpenCacheEntry(key, accessReq, this);
return NS_SUCCEEDED(rv);

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

@ -290,6 +290,7 @@ private:
nsCString mControlReadCarryOverBuf;
nsCOMPtr<nsICacheEntryDescriptor> mCacheEntry;
PRPackedBool mDoomCache;
nsCString mSuppliedEntityID;
};