wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-03 22:38:41 +09:00
Code Issues Projects Releases Packages Wiki Activity

partly import changes from tenfourfox:

Browse source 
- first rolling release: update to 91ESR EV and roots, TZs, TLDs (d7c93b6cf)
- security: M1730935, M1735152, M1730048 (1603b00d0)
This commit is contained in:
roytam1 2021-11-01 10:39:52 +08:00
commit 190b620c2d
5 changed files with 397 additions and 480 deletions
Download patch file Download diff file Expand all files Collapse all files

18
netwerk/base/nsSocketTransport2.cpp
View file

@ -2115,7 +2115,7 @@ NS_IMETHODIMP
nsSocketTransport::OpenInputStream(uint32_t flags,
uint32_t segsize,
uint32_t segcount,
nsIInputStream **result)
nsIInputStream **aResult)
{
SOCKET_LOG(("nsSocketTransport::OpenInputStream [this=%p flags=%x]\n",
this, flags));
@ -2124,6 +2124,7 @@ nsSocketTransport::OpenInputStream(uint32_t flags,
nsresult rv;
nsCOMPtr<nsIAsyncInputStream> pipeIn;
nsCOMPtr<nsIInputStream> result;
if (!(flags & OPEN_UNBUFFERED) || (flags & OPEN_BLOCKING)) {
// XXX if the caller wants blocking, then the caller also gets buffered!
@ -2143,10 +2144,10 @@ nsSocketTransport::OpenInputStream(uint32_t flags,
NS_ASYNCCOPY_VIA_WRITESEGMENTS, segsize);
if (NS_FAILED(rv)) return rv;
*result = pipeIn;
result = pipeIn;
}
else
*result = &mInput;
result = &mInput;
// flag input stream as open
mInputClosed = false;
@ -2154,7 +2155,7 @@ nsSocketTransport::OpenInputStream(uint32_t flags,
rv = PostEvent(MSG_ENSURE_CONNECT);
if (NS_FAILED(rv)) return rv;
NS_ADDREF(*result);
result.forget(aResult);
return NS_OK;
}
@ -2162,7 +2163,7 @@ NS_IMETHODIMP
nsSocketTransport::OpenOutputStream(uint32_t flags,
uint32_t segsize,
uint32_t segcount,
nsIOutputStream **result)
nsIOutputStream **aResult)
{
SOCKET_LOG(("nsSocketTransport::OpenOutputStream [this=%p flags=%x]\n",
this, flags));
@ -2171,6 +2172,7 @@ nsSocketTransport::OpenOutputStream(uint32_t flags,
nsresult rv;
nsCOMPtr<nsIAsyncOutputStream> pipeOut;
nsCOMPtr<nsIOutputStream> result;
if (!(flags & OPEN_UNBUFFERED) || (flags & OPEN_BLOCKING)) {
// XXX if the caller wants blocking, then the caller also gets buffered!
//bool openBuffered = !(flags & OPEN_UNBUFFERED);
@ -2189,10 +2191,10 @@ nsSocketTransport::OpenOutputStream(uint32_t flags,
NS_ASYNCCOPY_VIA_READSEGMENTS, segsize);
if (NS_FAILED(rv)) return rv;
*result = pipeOut;
result = pipeOut;
}
else
*result = &mOutput;
result = &mOutput;
// flag output stream as open
mOutputClosed = false;
@ -2200,7 +2202,7 @@ nsSocketTransport::OpenOutputStream(uint32_t flags,
rv = PostEvent(MSG_ENSURE_CONNECT);
if (NS_FAILED(rv)) return rv;
NS_ADDREF(*result);
result.forget(aResult);
return NS_OK;
}