Skip to content

Commit 15b3493

Browse files
jshajsha
committed
Merge pull request EFForg#2248 from youdly/hatena
Update Hatena.xml
2 parents 19f36bb + f17b6af commit 15b3493

1 file changed

Lines changed: 18 additions & 12 deletions

File tree

‎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>

0 commit comments

Comments
 (0)