KotJohansson/Male-Poon
1
1
Fork 0
mirror of http://git.mos6581.com/ManchildProductions/Male-Poon.git synced 2026-05-26 15:35:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'v26_Dev' into Atom

Browse Source
This commit is contained in:
Pale Moon
2016-09-07 13:37:40 +02:00
parent db194bd0b3 1dfe8ad08d
commit 0aa74572ce
11 changed files with 8357 additions and 1230 deletions
Download Patch File Download Diff File Expand all files Collapse all files
browser/components/places/content/browserPlacesViews.js
+1 -1
View File
@@ -955,7 +955,7 @@ PlacesToolbar.prototype = {
else {
button = document.createElement("toolbarbutton");
button.className = "bookmark-item";
button.setAttribute("label", aChild.title);
button.setAttribute("label", aChild.title || "");
let icon = aChild.icon;
if (icon)
button.setAttribute("image", icon);
browser/components/sessionstore/src/SessionStore.jsm
+2
View File
@@ -2776,10 +2776,12 @@ let SessionStoreInternal = {
this.restoreHistoryPrecursor(aWindow, tabs, winData.tabs,
(aOverwriteTabs ? (parseInt(winData.selected) || 1) : 0), 0, 0);
#ifdef MOZ_DEVTOOLS
if (aState.scratchpads) {
ScratchpadManager.restoreSession(aState.scratchpads);
}
#endif
// set smoothScroll back to the original value
tabstrip.smoothScroll = smoothScroll;
browser/config/version.txt
+1 -1
View File
@@ -1 +1 @@
26.4.0
26.4.1
browser/devtools/commandline/BuiltinCommands.jsm
+28 -9
View File
@@ -853,12 +853,24 @@ XPCOMUtils.defineLazyModuleGetter(this, "AppCacheUtils",
"</ul>" +
"";
/**
* Check host value and remove port part as it is not used
* for storing cookies.
*/
function sanitizeHost(host) {
if (host == null || host == "") {
throw new Error(gcli.lookup("cookieListOutNonePage"));
}
return host.split(":")[0];
}
gcli.addConverter({
from: "cookies",
to: "view",
exec: function(cookies, context) {
if (cookies.length == 0) {
let host = context.environment.document.location.host;
host = sanitizeHost(host);
let msg = gcli.lookupFormat("cookieListOutNoneHost", [ host ]);
return context.createView({ html: "<span>" + msg + "</span>" });
}
@@ -885,14 +897,21 @@ XPCOMUtils.defineLazyModuleGetter(this, "AppCacheUtils",
}
});
/**
* The cookie 'expires' value needs converting into something more readable
* The cookie 'expires' value needs converting into something more readable.
*
* And the unit of expires is sec, the unit that in argument of Date() needs
* millisecond.
*/
function translateExpires(expires) {
if (expires == 0) {
return gcli.lookup("cookieListOutSession");
}
return new Date(expires).toLocaleString();
let expires_msec = expires * 1000;
return (new Date(expires_msec)).toLocaleString();
}
/**
@@ -903,11 +922,12 @@ XPCOMUtils.defineLazyModuleGetter(this, "AppCacheUtils",
return host == null;
}
if (cookie.host.startsWith(".")) {
return cookie.host === "." + host;
return ("." + host).endsWith(cookie.host);
}
else {
return cookie.host == host;
if (cookie.host === "") {
return host.startsWith("file://" + cookie.path);
}
return cookie.host == host;
}
/**
@@ -929,10 +949,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "AppCacheUtils",
returnType: "cookies",
exec: function(args, context) {
let host = context.environment.document.location.host;
if (host == null || host == "") {
throw new Error(gcli.lookup("cookieListOutNonePage"));
}
host = sanitizeHost(host);
let enm = cookieMgr.getCookiesFromHost(host);
let cookies = [];
@@ -972,6 +989,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "AppCacheUtils",
],
exec: function(args, context) {
let host = context.environment.document.location.host;
host = sanitizeHost(host);
let enm = cookieMgr.getCookiesFromHost(host);
let cookies = [];
@@ -1045,6 +1063,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "AppCacheUtils",
],
exec: function(args, context) {
let host = context.environment.document.location.host;
host = sanitizeHost(host);
let time = Date.parse(args.expires) / 1000;
cookieMgr.add(args.domain ? "." + args.domain : host,
browser/devtools/scratchpad/scratchpad.js
+3 -1
View File
@@ -1186,7 +1186,9 @@ var Scratchpad = {
if (state) {
state = JSON.parse(state);
this.setState(state);
initialText = state.text;
if ("text" in state) {
initialText = state.text;
}
}
this.editor = new SourceEditor();
browser/themes/windows/browser.css
+25 -19
View File
@@ -1465,7 +1465,7 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
}
#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity {
color: hsl(92,100%,30%);
color: hsl(92,100%,20%);
-moz-margin-end: 4px;
background-image: -moz-linear-gradient(hsla(92,81%,16%,0),
hsla(92,81%,16%,.08) 25%,
@@ -1490,16 +1490,6 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
background-position: left;
}
#identity-box.verifiedIdentity:not(:-moz-lwtheme) {
background-color: #fff;
box-shadow: inset 0 0 2px rgb(0,168,0);
}
#identity-box.verifiedDomain:not(:-moz-lwtheme) {
background-color: rgb(224,234,247);
box-shadow: inset 0 0 2px rgb(0,79,168);
}
#identity-box:-moz-focusring {
outline: 1px dotted #000;
outline-offset: -3px;
@@ -1514,30 +1504,46 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
#urlbar[https_color="all"][security_level="broken"],
#urlbar[https_color="all"][security_level="low"] {
box-shadow: inset 0 0 4px rgb(168,0,0);
box-shadow: inset 0 0 2px rgb(168,0,0);
}
#urlbar[https_color="all"][security_level="mixed"],
#urlbar[https_color="secure-mixed"][security_level="mixed"] {
box-shadow: inset 0 0 4px rgb(168,79,0);
box-shadow: inset 0 0 2px rgb(168,79,0);
}
#urlbar[https_color="all"][security_level="high"],
#urlbar[https_color="secure-mixed"][security_level="high"],
#urlbar[https_color="secure-only"][security_level="high"] {
box-shadow: inset 0 0 4px rgb(0,79,168);
box-shadow: inset 0 0 2px rgb(0,79,168);
}
#urlbar[https_color="all"][security_level="ev"],
#urlbar[https_color="secure-mixed"][security_level="ev"],
#urlbar[https_color="secure-only"][security_level="ev"] {
box-shadow: inset 0 0 4px rgb(0,168,0);
box-shadow: inset 0 0 2px rgb(0,168,0);
}
#urlbar[https_color="all"]:-moz-lwtheme-darktext,
#urlbar[https_color="secure-mixed"]:-moz-lwtheme-darktext,
#urlbar[https_color="secure-only"]:-moz-lwtheme-darktext {
box-shadow: inset 0 0 2px;
#urlbar[https_color="all"][security_level="broken"]:not(:-moz-lwtheme),
#urlbar[https_color="all"][security_level="low"]:not(:-moz-lwtheme) {
box-shadow: inset 0 0 3px rgba(168,0,0,0.8);
}
#urlbar[https_color="all"][security_level="mixed"]:not(:-moz-lwtheme),
#urlbar[https_color="secure-mixed"][security_level="mixed"]:not(:-moz-lwtheme) {
box-shadow: inset 0 0 3px rgba(168,79,0,0.8);
}
#urlbar[https_color="all"][security_level="high"]:not(:-moz-lwtheme),
#urlbar[https_color="secure-mixed"][security_level="high"]:not(:-moz-lwtheme),
#urlbar[https_color="secure-only"][security_level="high"]:not(:-moz-lwtheme) {
box-shadow: inset 0 0 3px rgba(0,79,168,0.8);
}
#urlbar[https_color="all"][security_level="ev"]:not(:-moz-lwtheme),
#urlbar[https_color="secure-mixed"][security_level="ev"]:not(:-moz-lwtheme),
#urlbar[https_color="secure-only"][security_level="ev"]:not(:-moz-lwtheme) {
box-shadow: inset 0 0 3px rgba(0,168,0,0.8);
}
/* Location bar dropmarker */
content/base/src/nsXSSUtils.cpp
+5
View File
@@ -791,6 +791,11 @@ P1Match(const nsAString& p, const nsAString& s, PRInt32 sOffset,
PRInt32 plen = p.Length();
PRInt32 slen = s.Length();
if (plen <= 3 || plen > 10000 || slen <= 3 || slen > 10000) {
// Too small or too large components.
return NS_OK;
}
dist = (PRInt32 *) nsMemory::Alloc((plen+1)*(slen+1)*sizeof(PRInt32 *));
if (dist == NULL) {
netwerk/base/public/security-prefs.js
+20 -20
View File
@@ -25,37 +25,37 @@ pref("security.ssl3.ecdhe_rsa_aes_128_sha", true);
pref("security.ssl3.ecdhe_ecdsa_aes_128_sha", true);
pref("security.ssl3.ecdhe_rsa_aes_256_sha", true);
pref("security.ssl3.ecdhe_ecdsa_aes_256_sha", true);
pref("security.ssl3.ecdhe_rsa_des_ede3_sha", true);
pref("security.ssl3.dhe_rsa_aes_128_sha", true);
pref("security.ssl3.dhe_rsa_camellia_128_sha", true);
pref("security.ssl3.dhe_rsa_aes_256_sha", true);
pref("security.ssl3.dhe_rsa_camellia_256_sha", true);
pref("security.ssl3.dhe_rsa_des_ede3_sha", true);
pref("security.ssl3.dhe_dss_aes_128_sha", true);
pref("security.ssl3.dhe_dss_aes_256_sha", true);
pref("security.ssl3.ecdhe_rsa_rc4_128_sha", false);
pref("security.ssl3.ecdhe_ecdsa_rc4_128_sha", false);
pref("security.ssl3.rsa_aes_128_sha", true);
pref("security.ssl3.rsa_camellia_128_sha", true);
pref("security.ssl3.rsa_aes_256_sha", true);
pref("security.ssl3.rsa_camellia_256_sha", true);
pref("security.ssl3.rsa_des_ede3_sha", true);
pref("security.ssl3.rsa_rc4_128_sha", false);
pref("security.ssl3.rsa_rc4_128_md5", false);
// Cipher suites disabled by default
pref("security.ssl3.rsa_fips_des_ede3_sha", false);
pref("security.ssl3.dhe_dss_camellia_256_sha", false);
pref("security.ssl3.ecdh_ecdsa_aes_256_sha", false);
pref("security.ssl3.ecdh_ecdsa_aes_128_sha", false);
pref("security.ssl3.ecdh_ecdsa_des_ede3_sha", false);
pref("security.ssl3.ecdh_ecdsa_rc4_128_sha", false);
pref("security.ssl3.ecdh_rsa_aes_256_sha", false);
pref("security.ssl3.ecdh_rsa_aes_128_sha", false);
pref("security.ssl3.ecdh_rsa_des_ede3_sha", false);
pref("security.ssl3.ecdh_rsa_rc4_128_sha", false);
pref("security.ssl3.dhe_dss_camellia_128_sha", false);
pref("security.ssl3.rsa_seed_sha", false);
// Cipher suites disabled by default //Reason:
pref("security.ssl3.ecdhe_rsa_des_ede3_sha", false); //3DES
pref("security.ssl3.ecdhe_rsa_rc4_128_sha", false); //RC4
pref("security.ssl3.ecdhe_ecdsa_rc4_128_sha", false); //RC4
pref("security.ssl3.rsa_fips_des_ede3_sha", false); //FIPS,3DES
pref("security.ssl3.dhe_rsa_des_ede3_sha", false); //3DES
pref("security.ssl3.dhe_dss_camellia_256_sha", false); //DHE+DSS
pref("security.ssl3.dhe_dss_camellia_128_sha", false); //DHE+DSS
pref("security.ssl3.ecdh_ecdsa_aes_256_sha", false); //Non-ephemeral
pref("security.ssl3.ecdh_ecdsa_aes_128_sha", false); //Non-ephemeral
pref("security.ssl3.ecdh_ecdsa_des_ede3_sha", false); //Non-ephemeral,3DES
pref("security.ssl3.ecdh_ecdsa_rc4_128_sha", false); //Non-ephemeral,RC4
pref("security.ssl3.ecdh_rsa_aes_256_sha", false); //Non-ephemeral
pref("security.ssl3.ecdh_rsa_aes_128_sha", false); //Non-ephemeral
pref("security.ssl3.ecdh_rsa_des_ede3_sha", false); //Non-ephemeral,3DES
pref("security.ssl3.ecdh_rsa_rc4_128_sha", false); //Non-ephemeral,RC4
pref("security.ssl3.rsa_seed_sha", false); //In disuse
pref("security.ssl3.rsa_des_ede3_sha", false); //3DES
pref("security.ssl3.rsa_rc4_128_sha", false); //RC4
pref("security.ssl3.rsa_rc4_128_md5", false); //RC4,MD5
pref("security.default_personal_cert", "Ask Every Time");
pref("security.remember_cert_checkbox_default_setting", true);
security/manager/boot/src/nsSTSPreloadList.errors
+2217 -446
View File
File diff suppressed because it is too large Load Diff
security/manager/boot/src/nsSTSPreloadList.inc
+6052 -730
View File
File diff suppressed because it is too large Load Diff
security/manager/tools/getHSTSPreloadList.js
+3 -3
View File
@@ -3,8 +3,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
// How to run this file:
// 1. [obtain firefox source code]
// 2. [build/obtain firefox binaries]
// 1. [obtain Pale Moon source code]
// 2. [build/obtain Pale Moon binaries]
// 3. run `[path to]/run-mozilla.sh [path to]/xpcshell \
// [path to]/getHSTSPreloadlist.js \
// [absolute path to]/nsSTSPreloadlist.inc'
@@ -30,7 +30,7 @@ Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/FileUtils.jsm");
Cu.import("resource:///modules/XPCOMUtils.jsm");
const SOURCE = "https://src.chromium.org/chrome/trunk/src/net/http/transport_security_state_static.json";
const SOURCE = "https://chromium.googlesource.com/chromium/src/net/+/master/http/transport_security_state_static.json?format=TEXT";
const OUTPUT = "nsSTSPreloadList.inc";
const ERROR_OUTPUT = "nsSTSPreloadList.errors";
const MINIMUM_REQUIRED_MAX_AGE = 60 * 60 * 24 * 7 * 18;