Skip to content

Commit 4b28dc5

Browse files
committed
Merge pull request EFForg#1999 from donced/phoronix
Update Phoronix-Media.xml
2 parents 035e843 + 98b13f9 commit 4b28dc5

File tree

3 files changed

+19
-22
lines changed

3 files changed

+19
-22
lines changed
Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,31 @@
11
<!--
22
Nonfunctional:
33
4+
- (www.)phoronix.net ¹
5+
- (www.)phoronix-media.com ¹
46
- (www.)phoromatic.com ¹
5-
- (www.)phoronix.com (ssl_error_rx_record_too_long)
6-
7-
¹ Shows blank page; self-signed, CN: phx1.phoronix.com
7+
- (www.)phoronix-test-suite.com ¹
8+
- (www.)phoronix.com/forums (mixed content)
89
10+
¹ ssl_error_rx_record_too_long
911
-->
10-
<ruleset name="Phoronix Media (partial)" platform="mixedcontent">
1112

13+
<ruleset name="Phoronix Media">
14+
<target host="phoronix.com" />
15+
<target host="www.phoronix.com" />
1216
<target host="openbenchmarking.org" />
1317
<target host="www.openbenchmarking.org" />
1418

19+
<exclusion pattern="^http://(www\.)?phoronix\.com/forums/" />
20+
<test url="http://phoronix.com/forums/" />
21+
<test url="https://phoronix.com/forums/" />
22+
<test url="http://www.phoronix.com/forums/" />
23+
<test url="https://www.phoronix.com/forums/" />
24+
<rule from="^https://(www\.)?phoronix\.com/forums/" to="http://$1phoronix.com/forums/" downgrade="1" />
1525

16-
<securecookie host="^openbenchmarking\.org$" name=".*" />
17-
<securecookie host="^phoromatic\.com$" name=".*" />
18-
19-
20-
<!-- Michael has noticed our shenanigans and disabled https for pages (unless you pay up).
21-
https://trac.torproject.org/projects/tor/ticket/5728 -->
22-
<rule from="^http://(www\.)?openbenchmarking\.org/(ads/|(?:create/comment/|result/)?css/|embed\.php|favicon\.ico|s/css/)"
23-
to="https://$1openbenchmarking.org/$2" />
26+
<!-- breaks forum
27+
<securecookie host="^.*\.phoronix\.com$" name=".*" />-->
28+
<securecookie host="^.*\.openbenchmarking\.org$" name=".*" />
2429

30+
<rule from="^http:" to="https:" />
2531
</ruleset>

src/chrome/content/rules/Phoronix.com.xml

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

utils/downgrade-whitelist.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ NewsBlur
1919
Nextag (self-signed)
2020
NYTimes (breaks comments)
2121
Oak Ridge National Laboratory (partial)
22+
Phoronix Media
2223
Qz.com (partial)
2324
SRG SSR (partial)
2425
Stack Exchange (partial)

0 commit comments

Comments
 (0)