Macintosh-SW
/
tenfourfox
mirror of https://github.com/classilla/tenfourfox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

security: M1730935, M1735152, M1730048

This commit is contained in:
Cameron Kaiser 2021-10-29 16:03:29 -07:00
parent d7c93b6cfc
commit 1603b00d03
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
layout/xul/nsMenuFrame.cpp
View File

@ -1267,7 +1267,9 @@ nsMenuFrame::PassMenuCommandEventToPopupManager()
nsXULPopupManager* pm = nsXULPopupManager::GetInstance();
nsMenuParent* menuParent = GetMenuParent();
if (pm && menuParent && mDelayedMenuCommandEvent) {
pm->ExecuteMenu(mContent, mDelayedMenuCommandEvent);
nsCOMPtr<nsIContent> content = mContent;
RefPtr<nsXULMenuCommandEvent> event = mDelayedMenuCommandEvent;
pm->ExecuteMenu(content, event);
}
mDelayedMenuCommandEvent = nullptr;
}

2
modules/libpref/init/all.js
View File

@ -1436,7 +1436,7 @@ pref("network.http.spdy.default-concurrent", 100);
// alt-svc allows separation of transport routing from
// the origin host without using a proxy.
pref("network.http.altsvc.enabled", true);
pref("network.http.altsvc.oe", true);
pref("network.http.altsvc.oe", false); // bug 1730935
pref("network.http.diagnostics", false);

18
netwerk/base/nsSocketTransport2.cpp
View File

@ -2083,7 +2083,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));
@ -2092,6 +2092,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!
@ -2111,10 +2112,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;
@ -2122,7 +2123,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;
}
@ -2130,7 +2131,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));
@ -2139,6 +2140,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);
@ -2157,10 +2159,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;
@ -2168,7 +2170,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;
}

4
toolkit/content/about.js
View File

@ -25,7 +25,9 @@ var versionNum = Components.classes["@mozilla.org/xre/app-info;1"]
var version = document.getElementById("version");
// paranoia
if (versionNum.substr(0,3) == "45.") {
if (1 == 1) {
version.textContent = "Rolling Release";
} else if (versionNum.substr(0,3) == "45.") {
// FPR series
var vf = 0 + versionNum.substr(3);
var pl = ""+ (vf - (vf|0));