Skip to content

Commit 25fbc5b

Browse files
committed
Resolve merge conflict: delete no longer needed Bit.ly_vanity_domains.xml
2 parents 02fd654 + 82d3785 commit 25fbc5b

23 files changed

+38856
-405
lines changed

src/chrome/content/rules/42.ie.xml

Lines changed: 0 additions & 28 deletions
This file was deleted.

src/chrome/content/rules/Bit.ly_vanity_domains.xml

Lines changed: 0 additions & 163 deletions
This file was deleted.

src/chrome/content/rules/Bitly.xml

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
44
- Bitly.com.xml
55
- J.mp.xml
6+
- Bitly_branded_short_domains.xml
67
78
89
Insecure cookies are set for these domains:
@@ -11,29 +12,15 @@
1112
1213
-->
1314
<ruleset name="bit.ly">
14-
15-
<!-- Direct rewrites:
16-
-->
1715
<target host="bit.ly" />
1816
<target host="pix.bit.ly" />
1917
<target host="www.bit.ly" />
2018

21-
<!-- Complications:
22-
-->
23-
<target host="s.bit.ly" />
24-
25-
26-
<!-- Not secured by server:
27-
-->
19+
<!-- Not secured by server: -->
2820
<!--securecookie host="^\.bit\.ly$" name="^_bit$" /-->
2921

30-
<securecookie host="^(?:.*\.)?bit\.ly$" name=".+" />
31-
32-
33-
<rule from="^http://s\.bit\.ly/"
34-
to="https://s3.amazonaws.com/s.bit.ly/" />
22+
<securecookie host=".+" name=".+" />
3523

36-
<rule from="^http:"
37-
to="https:" />
24+
<rule from="^http:" to="https:" />
3825

3926
</ruleset>

0 commit comments

Comments
 (0)