Skip to content
This repository has been archived by the owner on Nov 6, 2023. It is now read-only.

Commit

Permalink
Small fixes.
Browse files Browse the repository at this point in the history
Remove spammy log message in ssl-observatory.
Add jsdoc in HTTPS.js.
Add all of pkg/ to gitignore.
  • Loading branch information
jsha committed Aug 29, 2014
1 parent b4f8257 commit e6cd64c
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
4 changes: 1 addition & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
*~
chromium.pem
dummy-chromium.pem
pkg/crx
pkg/*.crx
pkg/*.xpi
pkg/
src/chrome/content/rules/default.rulesets
src/defaults/rulesets.sqlite
*.swp
Expand Down
13 changes: 12 additions & 1 deletion src/chrome/content/code/HTTPS.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,18 @@ const HTTPS = {
httpsForced: null,
httpsForcedExceptions: null,
httpsRewrite: null,


/**
* Given a channel and a list of potentially applicable rules,
* redirect or abort a request if appropriate.
*
* @param {RuleSet[]} applicable_list A list of potentially applicable rules
* (i.e. those that match on a hostname basis).
* @param {nsIChannel} channel The channel to be manipulated.
* @param {boolean} httpNowhereEnabled Whether to abort non-https requests.
* @returns {boolean} True if the request was redirected; false if it was
* untouched or aborted.
*/
replaceChannel: function(applicable_list, channel, httpNowhereEnabled) {
var blob = HTTPSRules.rewrittenURI(applicable_list, channel.URI.clone());
if (blob === null) {
Expand Down
1 change: 0 additions & 1 deletion src/components/ssl-observatory.js
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,6 @@ SSLObservatory.prototype = {
file.initWithPath(this.HTTPSEverywhere.rw.chromeToPath(loc));
var data = this.HTTPSEverywhere.rw.read(file);
this.whitelist = JSON.parse(data);
this.log(DBUG, "yay\n" + data);
},

saveCertWhitelist: function() {
Expand Down

0 comments on commit e6cd64c

Please sign in to comment.