Skip to content

Commit 3375d5d

Browse files
pdepde
committed
Revert "More changes from master", which introduced a couple of bugs
This reverts commit ecf7f59. Conflicts: src/chrome/content/about.xul src/install.rdf
1 parent 7c900a3 commit 3375d5d

File tree

9 files changed

+27
-24
lines changed

9 files changed

+27
-24
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,3 @@ pkg/*.xpi
77
src/chrome/content/rules/default.rulesets
88
*.swp
99
tokenkeys.py*
10-
.idea

‎chromium/popup.html‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
<!-- Local copy of chrome://resources/css/chrome_shared.css -->
55
<link href="chrome-resources/css/chrome_shared.css" rel="stylesheet" type="text/css"/>
66

7+
<!-- Chrome 20 (remove this once stable channel is 21) --->
8+
<link href="chrome://resources/css/chrome_shared2.css" rel="stylesheet" type="text/css"/>
9+
710
<link href="popup.css" rel="stylesheet" type="text/css"/>
811
<script src="popup.js"></script>
912
</head>

‎chromium/rules.js‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,20 @@ RuleSets.prototype = {
154154
this.targets[host].push(rule_set);
155155
}
156156
},
157+
158+
setInsert: function(intoList, fromList) {
159+
// Insert any elements from fromList into intoList, if they are not
160+
// already there. fromList may be null.
161+
if (!fromList) return;
162+
for (var i = 0; i < fromList.length; i++)
163+
if (intoList.indexOf(fromList[i]) == -1)
164+
intoList.push(fromList[i]);
165+
},
157166

158167
potentiallyApplicableRulesets: function(host) {
159168
// Return a list of rulesets that apply to this host
160169
var i, tmp, t;
161-
var results = this.global_rulesets;
170+
var results = this.global_rulesets.slice(0); // copy global_rulesets
162171
if (this.targets[host])
163172
results = results.concat(this.targets[host]);
164173
// replace each portion of the domain with a * in turn
@@ -168,15 +177,13 @@ RuleSets.prototype = {
168177
segmented[i] = "*";
169178
t = segmented.join(".");
170179
segmented[i] = tmp;
171-
if (this.targets[t])
172-
results = results.concat(this.targets[t]);
180+
this.setInsert(results, this.targets[t]);
173181
}
174182
// now eat away from the left, with *, so that for x.y.z.google.com we
175183
// check *.z.google.com and *.google.com (we did *.y.z.google.com above)
176-
for (i = 1; i <= segmented.length - 2; ++i) {
184+
for (i = 1; i < segmented.length - 2; ++i) {
177185
t = "*." + segmented.slice(i,segmented.length).join(".");
178-
if (this.targets[t])
179-
results = results.concat(this.targets[t]);
186+
this.setInsert(results, this.targets[t]);
180187
}
181188
log(DBUG,"Applicable rules for " + host + ":");
182189
if (results.length == 0)

‎makecrx.sh‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ if [ -n "$1" ]; then
3232
fi
3333
fi
3434

35-
VERSION=`python -c "import json ; print(json.loads(open('chromium/manifest.json').read())['version'])"`
35+
VERSION=`python -c "import json ; print json.loads(open('chromium/manifest.json').read())['version']"`
3636

3737
echo "Building chrome version" $VERSION
3838

@@ -78,9 +78,8 @@ do_not_ship="*.py *.xml icon.jpg"
7878
rm -f $do_not_ship
7979
cd ../..
8080

81-
python ./utils/merge-rulesets.py
81+
. ./utils/merge-rulesets.sh
8282

83-
export RULESETS=chrome/content/rules/default.rulesets
8483
cp src/$RULESETS pkg/crx/rules/default.rulesets
8584

8685
echo 'var rule_list = [' > pkg/crx/rule_list.js

‎src/chrome/content/about.xul‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
<groupbox>
2323
<caption label="&https-everywhere.about.version;" />
24-
<label>3.3.2</label>
24+
<label>4.0development.9</label>
2525
</groupbox>
2626

2727
<groupbox>

‎src/chrome/content/toolbar_button.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,8 +251,8 @@ function reload_window() {
251251
}
252252

253253
function toggleEnabledState(){
254-
HTTPSEverywhere.toggleEnabledState();
255-
reload_window();
254+
HTTPSEverywhere.toggleEnabledState();
255+
reload_window();
256256

257257
// Change icon depending on enabled state
258258
httpsEverywhere.toolbarButton.changeIcon();

‎src/chrome/skin/https-everywhere.css‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
#https-everywhere-button {
2-
-moz-binding: url("chrome://https-everywhere/content/toolbar_button_binding.xml#https-everywhere-binding");
3-
-moz-box-orient: horizontal;
4-
}
5-
6-
#https-everywhere-button > .https-everywhere-button {
72
list-style-image: url("chrome://https-everywhere/skin/https-everywhere-24.png");
83
-moz-box-orient: horizontal;
94
}
105

11-
toolbar[iconsize="small"] #https-everywhere-button > .https-everywhere-button {
6+
toolbar[iconsize="small"] #https-everywhere-button {
127
list-style-image: url("chrome://https-everywhere/skin/https-everywhere-16.png");
138
-moz-box-orient: horizontal;
149
}

‎src/components/ssl-observatory.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ NOTE=4;
1414
WARN=5;
1515

1616
BASE_REQ_SIZE=4096;
17+
TIMEOUT = 60000;
1718
MAX_OUTSTANDING = 20; // Max # submission XHRs in progress
1819
MAX_DELAYED = 32; // Max # XHRs are waiting around to be sent or retried
19-
TIMEOUT = 60000;
2020

2121
ASN_PRIVATE = -1; // Do not record the ASN this cert was seen on
2222
ASN_IMPLICIT = -2 // ASN can be learned from connecting IP
@@ -505,7 +505,7 @@ SSLObservatory.prototype = {
505505
shouldSubmit: function(chain, domain) {
506506
// Return true if we should submit this chain to the SSL Observatory
507507
var rootidx = this.findRootInChain(chain.certArray);
508-
var ss = false; // ss: self-signed
508+
var ss= false;
509509

510510
if (chain.leaf.issuerName == chain.leaf.subjectName)
511511
ss = true;

‎src/install.rdf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<em:homepageURL>https://www.eff.org/https-everywhere</em:homepageURL>
1313
<em:optionsURL>chrome://https-everywhere/content/meta-preferences.xul</em:optionsURL>
1414
<em:iconURL>chrome://https-everywhere/skin/https-everywhere.png</em:iconURL>
15-
<em:updateURL>https://www.eff.org/files/https-everywhere-devel-update-2048.rdf</em:updateURL>
15+
<em:updateURL>https://www.eff.org/files/https-everywhere-update-2048.rdf</em:updateURL>
1616
<em:unpack>true</em:unpack> <!-- Required for Firefox 4 -->
1717
<em:updateKey>MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6MR8W/galdxnpGqBsYbqOzQb2eyW15YFjDDEMI0ZOzt8f504obNs920lDnpPD2/KqgsfjOgw2K7xWDJIj/18xUvWPk3LDkrnokNiRkA3KOx3W6fHycKL+zID7zy+xZYBuh2fLyQtWV1VGQ45iNRp9+Zo7rH86cdfgkdnWTlNSHyTLW9NbXvyv/E12bppPcEvgCTAQXgnDVJ0/sqmeiijn9tTFh03aM+R2V/21h8aTraAS24qiPCz6gkmYGC8yr6mglcnNoYbsLNYZ69zF1XHcXPduCPdPdfLlzVlKK1/U7hkA28eG3BIAMh6uJYBRJTpiGgaGdPd7YekUB8S6cy+CQIDAQAB</em:updateKey>
1818
<!-- firefox -->
@@ -28,15 +28,15 @@
2828
<Description>
2929
<em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
3030
<em:minVersion>2.0</em:minVersion>
31-
<em:maxVersion>99.*</em:maxVersion>
31+
<em:maxVersion>3.*</em:maxVersion>
3232
</Description>
3333
</em:targetApplication>
3434
<!-- thunderbird -->
3535
<em:targetApplication>
3636
<Description>
3737
<em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
3838
<em:minVersion>3.0</em:minVersion>
39-
<em:maxVersion>99.*</em:maxVersion>
39+
<em:maxVersion>3.1.*</em:maxVersion>
4040
</Description>
4141
</em:targetApplication>
4242
<!-- Conkeror -->

0 commit comments

Comments
 (0)