Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 18:08:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1563803 - Backout bug 1562315 for causing regressions, r=dragana

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D37103

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Honza Bambas 2019-07-05 19:13:33 +00:00
parent 1db4056744
commit 436942424d
2 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
netwerk/protocol/http/TunnelUtils.cpp
View File

@ -356,20 +356,18 @@ nsresult TLSFilterTransaction::ReadSegments(nsAHttpSegmentReader* aReader,
return NS_SUCCEEDED(rv) ? mReadSegmentReturnValue : rv;
}
nsresult TLSFilterTransaction::WriteSegmentsAgain(nsAHttpSegmentWriter* aWriter,
uint32_t aCount,
uint32_t* outCountWritten,
bool* again) {
nsresult TLSFilterTransaction::WriteSegments(nsAHttpSegmentWriter* aWriter,
uint32_t aCount,
uint32_t* outCountWritten) {
MOZ_ASSERT(OnSocketThread(), "not on socket thread");
LOG(("TLSFilterTransaction::WriteSegmentsAgain %p max=%d\n", this, aCount));
LOG(("TLSFilterTransaction::WriteSegments %p max=%d\n", this, aCount));
if (!mTransaction) {
return NS_ERROR_UNEXPECTED;
}
mSegmentWriter = aWriter;
nsresult rv =
mTransaction->WriteSegmentsAgain(this, aCount, outCountWritten, again);
nsresult rv = mTransaction->WriteSegments(this, aCount, outCountWritten);
if (NS_SUCCEEDED(rv) && NS_FAILED(mFilterReadCode) && !(*outCountWritten)) {
// nsPipe turns failures into silent OK.. undo that!
rv = mFilterReadCode;
@ -383,13 +381,6 @@ nsresult TLSFilterTransaction::WriteSegmentsAgain(nsAHttpSegmentWriter* aWriter,
return rv;
}
nsresult TLSFilterTransaction::WriteSegments(nsAHttpSegmentWriter* aWriter,
uint32_t aCount,
uint32_t* outCountWritten) {
bool again = false;
return WriteSegmentsAgain(aWriter, aCount, outCountWritten, &again);
}
nsresult TLSFilterTransaction::GetTransactionSecurityInfo(
nsISupports** outSecInfo) {
if (!mSecInfo) {

4
netwerk/protocol/http/TunnelUtils.h
View File

@ -144,10 +144,6 @@ class TLSFilterTransaction final : public nsAHttpTransaction,
NullHttpTransaction* QueryNullTransaction() override;
nsHttpTransaction* QueryHttpTransaction() override;
SpdyConnectTransaction* QuerySpdyConnectTransaction() override;
MOZ_MUST_USE nsresult WriteSegmentsAgain(nsAHttpSegmentWriter* writer,
uint32_t count,
uint32_t* countWritten,
bool* again) override;
private:
MOZ_MUST_USE nsresult StartTimerCallback();