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 726366 part 2 - fix tunnel spdy over http proxy initial settings race r=honzab

Browse Source
This commit is contained in:
Patrick McManus 2012-05-14 14:49:18 -04:00
parent 7d2bdf959b
commit 8864f747f9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -563,9 +563,8 @@ nsSocketOutputStream::Write(const char *buf, PRUint32 count, PRUint32 *countWrit
*countWritten = 0;
// A write of 0 bytes can be used to force the initial SSL handshake.
if (count == 0 && mByteCount)
return NS_OK;
// A write of 0 bytes can be used to force the initial SSL handshake, so do
// not reject that.
PRFileDesc* fd = nsnull;
{

1
netwerk/protocol/http/nsHttpConnection.cpp
View File

@ -870,6 +870,7 @@ nsHttpConnection::OnHeadersAvailable(nsAHttpTransaction *trans,
LOG(("ProxyStartSSL failed [rv=%x]\n", rv));
}
mCompletedProxyConnect = true;
mProxyConnectInProgress = false;
rv = mSocketOut->AsyncWait(this, 0, 0, nsnull);
// XXX what if this fails -- need to handle this error
NS_ASSERTION(NS_SUCCEEDED(rv), "mSocketOut->AsyncWait failed");