Skip to content

Commit 25b59b7

Browse files
Bryn Mosherdiracdeltas
authored andcommitted
simplified and corrected Imgur ruleset
Simplified and corrected Imgur ruleset since we now have full HTTPS support on imgure.com and its subdomains. Conflicts: src/chrome/content/rules/Imgur.xml
1 parent 4fe21a5 commit 25b59b7

File tree

1 file changed

+13
-25
lines changed

1 file changed

+13
-25
lines changed

src/chrome/content/rules/Imgur.xml

Lines changed: 13 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,22 @@
1-
<ruleset name="Imgur (partial, broken)" default_off="breaks albums">
1+
<!--
22
3-
<target host="imgur.com"/>
4-
<target host="*.imgur.com"/>
5-
<exclusion pattern="^http://api\.imgur\.com/"/>
6-
<!--
7-
302 to http.
8-
9-
https://mail1.eff.org/pipermail/https-everywhere-rules/2012-July/001255.html
10-
-->
11-
<exclusion pattern="^http://(www\.)?imgur\.com/($|\w/\w+\??$)" />
12-
<exclusion pattern="^http://(www\.)?imgur\.com/[a-zA-Z\d]+\.[a-z]+$"/>
13-
<!--
3+
Imgur now has full HTTPS support on all subdomains.
4+
Previously, there were issues as discussed :
145
https://mail1.eff.org/pipermail/https-everywhere-rules/2013-July/001645.html
15-
166
https://bugzilla.mozilla.org/show_bug.cgi?id=866986#c7
17-
-->
18-
<exclusion pattern="^http://(?:www\.)?imgur\.com/(?!(?:images|include|min|register|signin)(?:/|\?|$))" />
197
20-
<rule from="^http://(?:origin\.|s\.|www\.)?imgur\.com/"
21-
to="https://imgur.com/"/>
8+
Ruleset simplified and fixed by bryn@imgur.com, January 2014.
229
23-
<!-- This rule breaks the Imgur Uploader Firefox extension
24-
<rule from="^http://api\.imgur\.com/"
25-
to="https://api.imgur.com/"/-->
10+
-->
11+
<ruleset name="Imgur">
2612

27-
<!-- i.imgur.com doesn't match the certificate,
28-
but *some* urls can be converted to imgur.com -->
29-
<rule from="^http://i\.imgur\.com/((images|include)(/.*)?)?$"
30-
to="https://imgur.com/$1"/>
13+
<target host="imgur.com" />
14+
<target host="*.imgur.com" />
15+
16+
<rule from="^http://imgur\.com/"
17+
to="https://imgur.com/"/>
3118

32-
<securecookie host="^\.?imgur\.com" name=".*" />
19+
<rule from="^http://(\w\.)?imgur\.com/"
20+
to="https://$1imgur.com/"/>
3321

3422
</ruleset>

0 commit comments

Comments
 (0)