From c20fa5c51bfee11185f35f03abd1297d7c2e6963 Mon Sep 17 00:00:00 2001
From: donced <donced@users.noreply.github.com>
Date: Fri, 26 Jun 2015 12:53:46 +0930
Subject: [PATCH 1/4] Whitelist Phoronix domain for downgrade rule

---
 utils/downgrade-whitelist.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/utils/downgrade-whitelist.txt b/utils/downgrade-whitelist.txt
index 13c874c2a2fd..5bedaeb9c2a2 100644
--- a/utils/downgrade-whitelist.txt
+++ b/utils/downgrade-whitelist.txt
@@ -19,6 +19,7 @@ NewsBlur
 Nextag (self-signed)
 NYTimes (breaks comments)
 Oak Ridge National Laboratory (partial)
+Phoronix Media
 Qz.com (partial)
 Stack Exchange (partial)
 University of Alaska Anchorage (partial)

From e7835ee1c5c0647b1cb34f7e45e814b2c4c5082e Mon Sep 17 00:00:00 2001
From: donced <donced@users.noreply.github.com>
Date: Fri, 26 Jun 2015 13:12:10 +0930
Subject: [PATCH 2/4] Update Phoronix Media

Re-enable phoronix.com and openbenchmarking.org which were previously disabled (https://github.com/EFForg/https-everywhere/pull/1580  https://trac.torproject.org/projects/tor/ticket/5728). Merge them into one ruleset.
---
 src/chrome/content/rules/Phoronix-Media.xml | 30 ++++++++++++---------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/chrome/content/rules/Phoronix-Media.xml b/src/chrome/content/rules/Phoronix-Media.xml
index 4944e2ba6dc1..5ddea8ddc943 100644
--- a/src/chrome/content/rules/Phoronix-Media.xml
+++ b/src/chrome/content/rules/Phoronix-Media.xml
@@ -1,25 +1,31 @@
 <!--
 	Nonfunctional:
 
+		- (www.)phoronix.net ¹
+		- (www.)phoronix-media.com ¹
 		- (www.)phoromatic.com ¹
-		- (www.)phoronix.com	(ssl_error_rx_record_too_long)
-
-	¹ Shows blank page; self-signed, CN: phx1.phoronix.com
+		- (www.)phoronix-test-suite.com ¹
+		- (www.)phoronix.com/forums (mixed content)
 
+	¹ ssl_error_rx_record_too_long
 -->
-<ruleset name="Phoronix Media (partial)" platform="mixedcontent">
 
+<ruleset name="Phoronix Media">
+  	<target host="phoronix.com" />
+  	<target host="www.phoronix.com" />
 	<target host="openbenchmarking.org" />
 	<target host="www.openbenchmarking.org" />
 
+	<exclusion pattern="^http://(www\.)?phoronix\.com/forums/" />
+	<test url="http://phoronix.com/forums/" />
+	<test url="https://phoronix.com/forums/" />
+	<test url="http://www.phoronix.com/forums/" />
+	<test url="https://www.phoronix.com/forums/" />
+  	<rule from="^https://(www\.)?phoronix\.com/forums/" to="http://$1phoronix.com/forums/" downgrade="1" />
 
-	<securecookie host="^openbenchmarking\.org$" name=".*" />
-	<securecookie host="^phoromatic\.com$" name=".*" />
-
-
-	<!--	Michael has noticed our shenanigans and disabled https for pages (unless you pay up).
-		https://trac.torproject.org/projects/tor/ticket/5728	-->
-	<rule from="^http://(www\.)?openbenchmarking\.org/(ads/|(?:create/comment/|result/)?css/|embed\.php|favicon\.ico|s/css/)"
-		to="https://$1openbenchmarking.org/$2" />
+	<!-- breaks forum
+	<securecookie host="^.*\.phoronix\.com$" name=".*" />-->
+	<securecookie host="^.*\.openbenchmarking\.org$" name=".*" />
 
+  	<rule from="^http:" to="https:" />
 </ruleset>

From 935212e40cb37c2d61cf35d2d8e981e22e1b1caa Mon Sep 17 00:00:00 2001
From: donced <donced@users.noreply.github.com>
Date: Fri, 26 Jun 2015 13:13:55 +0930
Subject: [PATCH 3/4] Merge rule into Phoronix-Media.xml

---
 src/chrome/content/rules/Phoronix.com.xml | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 src/chrome/content/rules/Phoronix.com.xml

diff --git a/src/chrome/content/rules/Phoronix.com.xml b/src/chrome/content/rules/Phoronix.com.xml
deleted file mode 100644
index 7cabc4efa525..000000000000
--- a/src/chrome/content/rules/Phoronix.com.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<!--
-	breaks forum, https://github.com/EFForg/https-everywhere/pull/1496
--->
-
-<ruleset name="Phoronix.com" platform="mixedcontent">
-  <target host="phoronix.com" />
-  <target host="www.phoronix.com" />
-
-  <rule from="^http:" to="https:" />
-</ruleset>

From 98b13f92fb393d6752c939389d928c3ccbc7d511 Mon Sep 17 00:00:00 2001
From: donced <donced@users.noreply.github.com>
Date: Fri, 26 Jun 2015 13:24:29 +0930
Subject: [PATCH 4/4] Formatting

---
 src/chrome/content/rules/Phoronix-Media.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/chrome/content/rules/Phoronix-Media.xml b/src/chrome/content/rules/Phoronix-Media.xml
index 5ddea8ddc943..af9967bdfc04 100644
--- a/src/chrome/content/rules/Phoronix-Media.xml
+++ b/src/chrome/content/rules/Phoronix-Media.xml
@@ -17,10 +17,10 @@
 	<target host="www.openbenchmarking.org" />
 
 	<exclusion pattern="^http://(www\.)?phoronix\.com/forums/" />
-	<test url="http://phoronix.com/forums/" />
-	<test url="https://phoronix.com/forums/" />
-	<test url="http://www.phoronix.com/forums/" />
-	<test url="https://www.phoronix.com/forums/" />
+		<test url="http://phoronix.com/forums/" />
+		<test url="https://phoronix.com/forums/" />
+		<test url="http://www.phoronix.com/forums/" />
+		<test url="https://www.phoronix.com/forums/" />
   	<rule from="^https://(www\.)?phoronix\.com/forums/" to="http://$1phoronix.com/forums/" downgrade="1" />
 
 	<!-- breaks forum