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 280661 - SOCKS proxy server connection timeout hard-coded; r=bzbarsky

Browse Source
This commit is contained in:
Christopher Davis 2011-02-24 15:10:08 +02:00
parent 1eed9ae919
commit 9f892a74c3
2 changed files with 849 additions and 593 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
netwerk/base/src/nsSocketTransport2.cpp
View File

@ -1227,6 +1227,16 @@ nsSocketTransport::InitiateSocket()
}
}
//
// A SOCKS request was rejected; get the actual error code from
// the OS error
//
else if (PR_UNKNOWN_ERROR == code &&
mProxyTransparent &&
!mProxyHost.IsEmpty()) {
code = PR_GetOSError();
rv = ErrorAccordingToNSPR(code);
}
//
// The connection was refused...
//
else {
@ -1549,7 +1559,16 @@ nsSocketTransport::OnSocketReady(PRFileDesc *fd, PRInt16 outFlags)
mPollFlags = (PR_POLL_EXCEPT | PR_POLL_WRITE);
// Update poll timeout in case it was changed
mPollTimeout = mTimeouts[TIMEOUT_CONNECT];
}
}
//
// The SOCKS proxy rejected our request. Find out why.
//
else if (PR_UNKNOWN_ERROR == code &&
mProxyTransparent &&
!mProxyHost.IsEmpty()) {
code = PR_GetOSError();
mCondition = ErrorAccordingToNSPR(code);
}
else {
//
// else, the connection failed...

1421
netwerk/socket/nsSOCKSIOLayer.cpp
View File

File diff suppressed because it is too large Load Diff