Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 04:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out 2 changesets (bug 1435899) for failing android at modules/libpref/test/unit/test_defaultValues.js pn a CLOSED TREE

Browse Source 
Backed out changeset 925adb267211 (bug 1435899)
Backed out changeset f22f1ab67c5a (bug 1435899)
This commit is contained in:
Andreea Pavel 2018-03-09 23:14:32 +02:00
parent 84e524739b
commit 7d4b5748e1
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
netwerk/protocol/data/nsDataChannel.cpp
View File

@ -8,10 +8,12 @@
#include "nsDataChannel.h"
#include "mozilla/Base64.h"
#include "nsIOService.h"
#include "nsDataHandler.h"
#include "nsIPipe.h"
#include "nsIInputStream.h"
#include "nsIOutputStream.h"
#include "nsEscape.h"
#include "nsStringStream.h"
using namespace mozilla;
@ -84,6 +86,16 @@ nsDataChannel::OpenContentStream(bool async, nsIInputStream **result,
}
nsCOMPtr<nsIInputStream> bufInStream;
nsCOMPtr<nsIOutputStream> bufOutStream;
// create an unbounded pipe.
rv = NS_NewPipe(getter_AddRefs(bufInStream),
getter_AddRefs(bufOutStream),
nsIOService::gDefaultSegmentSize,
UINT32_MAX,
async, true);
if (NS_FAILED(rv))
return rv;
uint32_t contentLen;
if (lBase64) {
@ -91,11 +103,9 @@ nsDataChannel::OpenContentStream(bool async, nsIInputStream **result,
rv = Base64Decode(data, decodedData);
NS_ENSURE_SUCCESS(rv, rv);
contentLen = decodedData.Length();
rv = NS_NewCStringInputStream(getter_AddRefs(bufInStream), decodedData);
rv = bufOutStream->Write(decodedData.get(), decodedData.Length(), &contentLen);
} else {
contentLen = data.Length();
rv = NS_NewCStringInputStream(getter_AddRefs(bufInStream), data);
rv = bufOutStream->Write(data.Data(), data.Length(), &contentLen);
}
if (NS_FAILED(rv))

14
xpcom/io/NonBlockingAsyncInputStream.cpp
View File

@ -169,19 +169,7 @@ NonBlockingAsyncInputStream::Close()
NS_IMETHODIMP
NonBlockingAsyncInputStream::Available(uint64_t* aLength)
{
nsresult rv = mInputStream->Available(aLength);
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}
// Nothing more to read. Let's close the stream now.
if (*aLength == 0) {
mInputStream->Close();
mClosed = true;
return NS_BASE_STREAM_CLOSED;
}
return NS_OK;
return mInputStream->Available(aLength);
}
NS_IMETHODIMP