Skip to content

Commit 6f430ff

Browse files
jshajsha
committed
Merge branch 'master' of github.com:EFForg/https-everywhere
2 parents f1dbf84 + 60f89ca commit 6f430ff

6 files changed

Lines changed: 90 additions & 60 deletions

File tree

‎src/chrome/content/rules/Digi-Key.xml‎

Lines changed: 37 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<!--
2-
Disabled by https-everywhere-checker because:
3-
Fetch error: http://digikey.com/ => https://www.digikey.com/: Redirect for 'http://digikey.com/' missing Location
2+
43
Nonfunctional subdomains:
54
65
- pdfcatalog
@@ -12,22 +11,38 @@ Fetch error: http://digikey.com/ => https://www.digikey.com/: Redirect for 'http
1211
1312
1413
Fully covered subdomains:
15-
16-
- digikeytest
17-
- dkc1
18-
- dkc3
19-
- form
20-
- media
21-
- ordering
22-
- orderingtest
23-
- punchout
24-
- punchouttest
14+
- .com:
15+
- digikeytest
16+
- dkc1
17+
- dkc3
18+
- form
19+
- media
20+
- punchout
21+
- punchouttest
22+
23+
- .de:
24+
- digikeytest
25+
- punchout
26+
- punchouttest
2527
2628
-->
27-
<ruleset name="Digi-Key (partial)" default_off='failed ruleset test'>
29+
<ruleset name="Digi-Key (partial)">
2830

2931
<target host="digikey.com" />
30-
<target host="*.digikey.com" />
32+
<target host="www.digikey.com" />
33+
<target host="digikeytest.digikey.com" />
34+
<target host="dkc1.digikey.com" />
35+
<target host="dkc3.digikey.com" />
36+
<target host="form.digikey.com" />
37+
<target host="media.digikey.com" />
38+
<target host="punchout.digikey.com" />
39+
<target host="punchouttest.digikey.com" />
40+
<target host="digikey.de" />
41+
<target host="www.digikey.de" />
42+
<target host="digikeytest.digikey.de" />
43+
<target host="punchout.digikey.de" />
44+
<target host="punchouttest.digikey.de" />
45+
3146
<!--
3247
These paths 404:
3348
@@ -37,17 +52,17 @@ Fetch error: http://digikey.com/ => https://www.digikey.com/: Redirect for 'http
3752
These paths redirect to http:
3853
3954
- scripts/dksearch/dksus.dll
40-
-->
41-
<exclusion pattern="^http://(?:www\.)?digikey\.com/(?:product-(?:detail|search)|scripts/dksearch)" />
42-
55+
56+
exclusion pattern="^http://(www\.)?digikey\.(com|de)/(product-(detail|search)|scripts/dksearch)" /-->
4357

44-
<securecookie host="^(?!www\.).+\.digikey\.com$" name=".+" />
4558

59+
<securecookie host="^.*\.digikey\.(com|de)$" name=".+" />
4660

47-
<rule from="^http://digikey\.com/"
48-
to="https://www.digikey.com/" />
61+
<!-- connection refused -->
62+
<rule from="^http://digikey\.(com|de)/"
63+
to="https://www.digikey.$1/" />
4964

50-
<rule from="^http://(digikeytest|dkc\d|form|media|ordering(?:test)?|punchout(?:test)?|www)\.digikey\.com/"
51-
to="https://$1.digikey.com/" />
65+
<rule from="^http:"
66+
to="https:" />
5267

5368
</ruleset>

‎src/chrome/content/rules/Hatena.xml‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,31 +53,37 @@
5353
-->
5454
<ruleset name="Hatena (partial)">
5555

56-
<target host="hatena.ne.jp" />
5756
<target host="*.hatena.ne.jp" />
5857
<target host="*.st-hatena.com" />
5958

6059

61-
<!-- Not secured by server:
62-
-->
60+
<!-- Not secured by server: -->
6361
<!--securecookie host="^\.hatena\.ne\.jp$" name="^b$" /-->
62+
<!--securecookie host="^\.hatena\.ne\.jp$" name=".+" /-->
6463

65-
<securecookie host="^\.hatena\.ne\.jp$" name=".+" />
6664

65+
<rule from="^http://(www\.)?hatena\.ne\.jp/(css/|images/|login($|\?|/)|statics/)"
66+
to="https://www.hatena.ne.jp/$2" />
6767

68-
<rule from="^http://(?:www\.)?hatena\.ne\.jp/(css/|images/|login(?:$|\?|/)|statics/)"
69-
to="https://www.hatena.ne.jp/$1" />
68+
<test url="http://hatena.ne.jp/css/" />
69+
<test url="http://hatena.ne.jp/images/" />
70+
<test url="http://hatena.ne.jp/login/" />
71+
<test url="http://hatena.ne.jp/statics/" />
72+
<test url="http://www.hatena.ne.jp/css/" />
73+
<test url="http://www.hatena.ne.jp/images/" />
74+
<test url="http://www.hatena.ne.jp/login/" />
75+
<test url="http://www.hatena.ne.jp/statics/" />
7076

71-
<rule from="^http://(b|d)\.(?:hatena\.ne\.jp|st-hatena\.com)/images/"
77+
<rule from="^http://(b|d)\.st-hatena\.com/images/"
7278
to="https://$1.hatena.ne.jp/images/" />
7379

74-
<rule from="^http://cdn-ak\.favicon\.st-hetena\.com/"
75-
to="https://a248.e.akamai.net/m/336/3102/4/cdn-ak.favicon.st-hatena.com/" />
80+
<test url="http://b.st-hatena.com/images/" />
81+
<test url="http://d.st-hatena.com/images/" />
7682

77-
<rule from="^http://(?:cdn\.)?www\.st-hatena\.com/"
83+
<rule from="^http://(cdn\.)?www\.st-hatena\.com/"
7884
to="https://www.hatena.ne.jp/" />
7985

80-
<rule from="^http://cdn1\.www\.st-hatena\.com/"
81-
to="https://a248.e.akamai.net/f/1075/6343/5/cdn1.www.st-hatena.com/" />
86+
<test url="http://cdn.www.st-hatena.com/" />
87+
<test url="http://www.st-hatena.com/" />
8288

8389
</ruleset>

‎src/chrome/content/rules/NEXTINpact.com.xml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,16 @@
66
77
- forum ¹
88
- www ²
9+
- ^ ³
10+
- cdn ³
911
1012
¹ Dropped
1113
² Redirects to http
14+
³ CloudFlare error: Invalid SSL cert
1215
1316
1417
Fully covered hosts in *nextinpact.com:
1518
16-
- ^
17-
- cdn
1819
- compte
1920
2021
@@ -28,8 +29,9 @@
2829

2930
<!-- Direct rewrites:
3031
-->
31-
<target host="nextinpact.com" />
32-
<target host="cdn.nextinpact.com" />
32+
<!-- CloudFlare error -->
33+
<!--target host="nextinpact.com" />
34+
<target host="cdn.nextinpact.com" /-->
3335
<target host="compte.nextinpact.com" />
3436

3537
<!-- Redirects to http:
@@ -42,7 +44,7 @@
4244
<!--securecookie host="^\.nextinpact\.com$" name="^(__cfduid|ARRAffinity|cf_clearance)$" /-->
4345
<!--securecookie host="^compte\.nextinpact\.com$" name="^__RequestVerificationToken$" /-->
4446

45-
<securecookie host="^\.nextinpact\.com$" name="^__cfduid$" />
47+
<!--securecookie host="^\.nextinpact\.com$" name="^__cfduid$" /-->
4648
<securecookie host="^compte\.nextinpact\.com$" name=".+" />
4749

4850

‎src/chrome/content/rules/SLF.se.xml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
<!--
2-
Disabled by https-everywhere-checker because:
3-
Fetch error: http://slf.se/ => https://www.slf.se/: (60, 'SSL certificate problem: unable to get local issuer certificate')
4-
Fetch error: http://www.slf.se/ => https://www.slf.se/: (60, 'SSL certificate problem: unable to get local issuer certificate') slf is a swedish labour union -->
5-
<ruleset name="SLF.se" platform="mixedcontent" default_off='failed ruleset test'>
1+
<ruleset name="SLF.se">
62
<target host="slf.se" />
73
<target host="www.slf.se" />
8-
<rule from="^http://slf\.se/" to="https://www.slf.se/"/>
9-
<rule from="^http://www\.slf\.se/" to="https://www.slf.se/"/>
10-
</ruleset>
114

5+
<rule from="^http://slf\.se/"
6+
to="https://www.slf.se/"/>
7+
<rule from="^http:"
8+
to="https:"/>
9+
</ruleset>

‎src/chrome/content/rules/Zend.xml‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
<!--
2-
Disabled by https-everywhere-checker because:
3-
Fetch error: http://zend.com/ => https://www.zend.com/: (28, 'Operation timed out after 14004 milliseconds with 3809 out of 16071 bytes received')
42
Other Zend rulesets:
53
64
- Apigility.org.xml
@@ -16,9 +14,9 @@ Fetch error: http://zend.com/ => https://www.zend.com/: (28, 'Operation timed ou
1614
Nonfunctional subdomains:
1715
1816
- blog *
19-
- forums (dropped)
17+
- forums *
2018
21-
* Dropped
19+
* 403
2220
2321
2422
Problematic subdomains:
@@ -70,11 +68,15 @@ Fetch error: http://zend.com/ => https://www.zend.com/: (28, 'Operation timed ou
7068
* Secured by us
7169
7270
-->
73-
<ruleset name="Zend (partial)" default_off='failed ruleset test'>
71+
<ruleset name="Zend (partial)" platform="mixedcontent">
7472

7573
<target host="zend.com" />
76-
<target host="*.zend.com" />
77-
<!--exclusion pattern="^http://(blog|framework)\.zend\.com/" /-->
74+
<target host="www.zend.com" />
75+
<target host="pages.zend.com" />
76+
<target host="shop.zend.com" />
77+
<target host="static.zend.com" />
78+
79+
<test url="http://static.zend.com/shop/" />
7880

7981

8082
<securecookie host="^\.zend\.com$" name="^__utm\w$" />
@@ -85,17 +87,16 @@ Fetch error: http://zend.com/ => https://www.zend.com/: (28, 'Operation timed ou
8587
<securecookie host="^shop\.zend\.com$" name="^(?:\d{8}-SKEY|\d{8}-VID|HumanClickSiteContainerID_\d{8}|lpFPCtest|VIEWED_PRODUCTS)$" />
8688

8789

88-
<rule from="^http://(?:www\.)?zend\.com/"
90+
<rule from="^http://zend\.com/"
8991
to="https://www.zend.com/" />
9092

91-
<rule from="^http://(pages|shop)\.zend\.com/"
92-
to="https://$1.zend.com/" />
93-
9493
<!-- NB: Must catch this before the next rule. -->
9594
<rule from="^http://static\.zend\.com/shop/"
9695
to="https://shop-zend.pantherssl.com/" />
9796

9897
<rule from="^http://static\.zend\.com/"
9998
to="https://static-zend.pantherssl.com/" />
10099

100+
<rule from="^http:"
101+
to="https:" />
101102
</ruleset>

‎src/chrome/content/rules/kinoX.to.xml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
11
<ruleset name="kinoX.to">
2-
<target host="kinox.to"/>
3-
<target host="www.kinox.to"/>
2+
<target host="kinox.am"/>
3+
<target host="www.kinox.am"/>
44
<target host="kinox.me"/>
55
<target host="www.kinox.me"/>
6+
<target host="kinox.nu"/>
7+
<target host="www.kinox.nu"/>
8+
<target host="kinox.pe"/>
9+
<target host="www.kinox.pe"/>
10+
<target host="kinox.to"/>
11+
<target host="www.kinox.to"/>
12+
<target host="kinox.tv"/>
13+
<target host="www.kinox.tv"/>
614

715
<rule from="^http:"
816
to="https:"/>

0 commit comments

Comments
 (0)