Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 752648 - backout patch for breaking cert override dialog r=backout

Browse Source
This commit is contained in:
Patrick McManus 2012-05-10 13:11:10 -04:00
parent f8c002b1a2
commit 4cd96ac9ae
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -309,13 +309,8 @@ nsHttpConnection::EnsureNPNComplete()
PRUint32 count = 0;
rv = mSocketOut->Write("", 0, &count);
if (NS_FAILED(rv) && rv != NS_BASE_STREAM_WOULD_BLOCK) {
LOG(("nsHttpConnection::EnsureNPNComplete %p socket write failed "
"with result %X\n", this, rv));
mSocketOutCondition = rv;
if (NS_FAILED(rv) && rv != NS_BASE_STREAM_WOULD_BLOCK)
goto npnComplete;
}
return false;
}
@ -1252,14 +1247,7 @@ nsHttpConnection::OnSocketWritable()
LOG((" writing transaction request stream\n"));
mProxyConnectInProgress = false;
if (NS_SUCCEEDED(mSocketOutCondition) ||
mSocketOutCondition == NS_BASE_STREAM_WOULD_BLOCK) {
rv = mTransaction->ReadSegments(this, nsIOService::gDefaultSegmentSize, &n);
}
else {
rv = mSocketOutCondition;
}
rv = mTransaction->ReadSegments(this, nsIOService::gDefaultSegmentSize, &n);
}
LOG((" ReadSegments returned [rv=%x read=%u sock-cond=%x]\n",