Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 05:45:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix 34359 - nsSocketTransport timeout should also work while waiting on

Browse Source 
actual data, not only while connecting.
This commit is contained in:
ruslan%netscape.com 2000-04-05 04:49:35 +00:00
parent 40c957386d
commit be9ac37c1b
1 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
netwerk/base/src/nsSocketTransport.cpp
View File

@ -298,32 +298,33 @@ nsresult nsSocketTransport::Init(nsSocketTransportService* aService,
}
nsresult nsSocketTransport::CheckForTimeout(PRIntervalTime aCurrentTime)
nsresult nsSocketTransport::CheckForTimeout (PRIntervalTime aCurrentTime)
{
nsresult rv = NS_OK;
PRIntervalTime idleInterval;
// Enter the socket transport lock...
nsAutoMonitor mon(mMonitor);
idleInterval = aCurrentTime - mLastActiveTime;
//
// Only timeout if the transport is waiting to connect to the server
//
if ((eSocketState_WaitConnect == mCurrentState) &&
(idleInterval >= gTimeoutInterval)) {
PR_LOG(gSocketLog, PR_LOG_ERROR,
("nsSocketTransport::CheckForTimeout() [%s:%d %x].\t"
nsresult rv = NS_OK;
PRIntervalTime idleInterval;
// Enter the socket transport lock...
nsAutoMonitor mon(mMonitor);
idleInterval = aCurrentTime - mLastActiveTime;
//
// Only timeout if the transport is waiting to connect to the server
//
if ((mCurrentState == eSocketState_WaitConnect || mCurrentState == eSocketState_WaitReadWrite)
&& idleInterval >= gTimeoutInterval)
{
PR_LOG(gSocketLog, PR_LOG_ERROR,
("nsSocketTransport::CheckForTimeout() [%s:%d %x].\t"
"TIMED OUT... Idle interval: %d\n",
mHostName, mPort, this, idleInterval));
// Move the transport into the Timeout state...
mCurrentState = eSocketState_Timeout;
rv = NS_ERROR_NET_TIMEOUT;
}
return rv;
// Move the transport into the Timeout state...
mCurrentState = eSocketState_Timeout;
rv = NS_ERROR_NET_TIMEOUT;
}
return rv;
}