Merge branch 'master' of github.com:EFForg/https-everywhere into getb… · gitgud-software/https-everywhere@68c662a · GitHub
Skip to content

Commit 68c662a

Browse files
jshajsha
committed
Merge branch 'master' of github.com:EFForg/https-everywhere into getbrowserforchannel
2 parents 930ddb4 + c6b7c6c commit 68c662a

2,790 files changed

Lines changed: 12316 additions & 6593 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.md‎

Lines changed: 1 addition & 1 deletion

‎makexpi.sh‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -169,21 +169,7 @@ else
169169
echo >&2 "Total included rules: `sqlite3 $RULESETS_SQLITE 'select count(*) from rulesets'`"
170170
echo >&2 "Rules disabled by default: `find chrome/content/rules -name "*.xml" | xargs grep -F default_off | wc -l`"
171171
echo >&2 "Created $XPI_NAME"
172-
173-
# Push to Android Firefox if device is connected
174-
# XXX on some systems, adb may require sudo...
175-
if type adb > /dev/null && adb devices > /dev/null 2>/dev/null ; then
176-
ADB_FOUND=`adb devices | tail -2 | head -1 | cut -f 1 | sed 's/ *$//g'`
177-
if [ "$ADB_FOUND" != "List of devices attached" ]; then
178-
echo Pushing "$XPI_NAME" to /sdcard/"$XPI_NAME"
179-
adb push "../$XPI_NAME" /sdcard/"$XPI_NAME"
180-
adb shell am start -a android.intent.action.VIEW \
181-
-c android.intent.category.DEFAULT \
182-
-d file:///mnt/sdcard/"$XPI_NAME" \
183-
-n $ANDROID_APP_ID/.App
184-
fi
185-
fi
186-
172+
../utils/android-push.sh "$XPI_NAME"
187173
if [ -n "$BRANCH" ]; then
188174
cd ../..
189175
cp $SUBDIR/$XPI_NAME pkg

‎src/Changelog‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
5.0development.2 (2014-12-22)
2+
* Merged mobile support from 4.0 branch.
3+
* New translations imported:
4+
Catalan, Chinese (Taiwan), Croatian (Croatia),
5+
Estonian, Faroese, French (Canada), Khmer, Malay (Malaysia),
6+
Portuguese (Brazil), Romanian, Serbian, Sinhala (Sri Lanka),
7+
Slovak (Slovakia), Slovenian (Slovenia), Thai, Ukrainian
8+
* Various ruleset fixes.
9+
* Candidate for a 5.0 series stable release.
10+
111
5.0development.1 (2014-11-25)
212
* Support for multi-process Firefox (aka electrolysis or e10s).
313
* Merge latest rulesets.

‎src/chrome/content/code/AndroidUI.jsm‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,16 @@ function loadIntoWindow() {
2727
} else if (urlbarId) {
2828
aWindow.NativeWindow.pageactions.remove(urlbarId);
2929
}
30+
31+
// When navigating away from a page, we want to clear the applicable list for
32+
// that page. There are a few different APIs to do this, but this is the one
33+
// that work on mobile. We trigger on pagehide rather than pageshow because we
34+
// want to capture subresources during load.
35+
var BrowserApp = aWindow.BrowserApp;
36+
BrowserApp.deck.addEventListener("pagehide", function(evt) {
37+
var browser = BrowserApp.getBrowserForDocument(evt.target);
38+
HTTPSEverywhere.resetApplicableList(browser);
39+
}, true);
3040
}
3141

3242
function unloadFromWindow() {

‎src/chrome/content/code/ApplicableList.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// were applied, and which ones weren't but might have been, to the contents
33
// of a given page (top level nsIDOMWindow)
44

5-
serial_number = 0;
5+
var serial_number = 0;
66

77
function ApplicableList(logger, uri) {
88
this.log = logger;

‎src/chrome/content/code/HTTPSRules.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ const HTTPSRules = {
635635
}
636636
}
637637
} else {
638-
this.log(INFO, "For target " + target + ", found no ids in DB");
638+
this.log(DBUG, "For target " + target + ", found no ids in DB");
639639
}
640640
return output;
641641
},
@@ -768,17 +768,17 @@ const HTTPSRules = {
768768
return false;
769769
}
770770

771-
this.log(INFO, "Testing securecookie applicability with " + test_uri);
771+
this.log(DBUG, "Testing securecookie applicability with " + test_uri);
772772
var rs = this.potentiallyApplicableRulesets(domain);
773773
for (var i = 0; i < rs.length; ++i) {
774774
if (!rs[i].active) continue;
775775
var rewrite = rs[i].apply(test_uri);
776776
if (rewrite) {
777-
this.log(INFO, "Yes: " + rewrite);
777+
this.log(DBUG, "Safe to secure cookie for " + test_uri + ": " + rewrite);
778778
return true;
779779
}
780780
}
781-
this.log(INFO, "(NO)");
781+
this.log(DBUG, "Unsafe to secure cookie for " + test_uri);
782782
return false;
783783
}
784784
};

‎src/chrome/content/code/IOUtil.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ const IOUtil = {
121121
},
122122

123123
abort: function(channel, noNetwork) {
124-
channel.cancel(Cr.NS_ERROR_ABORT);
124+
channel.cancel(Components.results.NS_ERROR_ABORT);
125125
},
126126

127127
findWindow: function(channel) {

‎src/chrome/content/code/Root-CAs.js‎

Lines changed: 1 addition & 1 deletion

0 commit comments

Comments
 (0)