From 0963cf2e7c995cc558617b95d3998ed6eff0b00f Mon Sep 17 00:00:00 2001
From: Philip Nassr <philip_nassr@yahoo.com>
Date: Thu, 23 Feb 2017 23:57:41 +0000
Subject: [PATCH 01/16] TYM

Added HTTPS Everywhere to TYM website - sample
---
 src/chrome/content/rules/TYM | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 src/chrome/content/rules/TYM

diff --git a/src/chrome/content/rules/TYM b/src/chrome/content/rules/TYM
new file mode 100644
index 000000000000..9a461ea185c7
--- /dev/null
+++ b/src/chrome/content/rules/TYM
@@ -0,0 +1,9 @@
+<ruleset name="Testyourmight">
+  <target host="*.testyourmight.com" />
+
+  <rule from="^http://(\w{2})\.testyourmight\.com/*"
+          to="https://secure.testyourmight.com/*" />
+          
+  <securecookie host="^testyourmight\.com$" name=".+" />
+          
+</ruleset>

From 6b51dee0c5113dedc0cee9eb253a337ee8d8283b Mon Sep 17 00:00:00 2001
From: Philip Nassr <philip_nassr@yahoo.com>
Date: Sun, 5 Mar 2017 17:17:40 +0000
Subject: [PATCH 02/16] Create tym.com

Create a file "tym.com.xml", which adds a rule for the
"testyourmight.com" website.
---
 src/chrome/content/rules/tym.com.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 src/chrome/content/rules/tym.com.xml

diff --git a/src/chrome/content/rules/tym.com.xml b/src/chrome/content/rules/tym.com.xml
new file mode 100644
index 000000000000..67746adf20ea
--- /dev/null
+++ b/src/chrome/content/rules/tym.com.xml
@@ -0,0 +1,15 @@
+<!--
+	Nonfunctional hosts in *.example1.com:
+
+	h: http redirect
+	m: certificate mismatch
+	r: connection refused
+	s: self-signed certificate
+	t: timeout on https
+-->
+<ruleset name="testyourmight.com">
+	<target host="testyourmight.com" />
+	<target host="www.testyourmight.com" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>

From 0494c5d2ce543c16f57f07c5e1220d93f6eceb6a Mon Sep 17 00:00:00 2001
From: Philip Nassr <philip_nassr@yahoo.com>
Date: Sun, 5 Mar 2017 18:20:40 +0000
Subject: [PATCH 03/16] Update TYM

* Change some of the comments for the TYM ruleset
---
 src/chrome/content/rules/tym.com.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/chrome/content/rules/tym.com.xml b/src/chrome/content/rules/tym.com.xml
index 67746adf20ea..49100b56e21d 100644
--- a/src/chrome/content/rules/tym.com.xml
+++ b/src/chrome/content/rules/tym.com.xml
@@ -1,5 +1,5 @@
 <!--
-	Nonfunctional hosts in *.example1.com:
+	Nonfunctional hosts in *.testyourmight.com:
 
 	h: http redirect
 	m: certificate mismatch

From f4e62ed8a89d40c7bf2d362bdf54ab0ff29a9fd6 Mon Sep 17 00:00:00 2001
From: Philip Nassr <philip_nassr@yahoo.com>
Date: Thu, 27 Apr 2017 18:54:31 +0100
Subject: [PATCH 04/16] Delete TYM

Delete Testyourmight rule, inefficiently written.
---
 src/chrome/content/rules/TYM | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 src/chrome/content/rules/TYM

diff --git a/src/chrome/content/rules/TYM b/src/chrome/content/rules/TYM
deleted file mode 100644
index 9a461ea185c7..000000000000
--- a/src/chrome/content/rules/TYM
+++ /dev/null
@@ -1,9 +0,0 @@
-<ruleset name="Testyourmight">
-  <target host="*.testyourmight.com" />
-
-  <rule from="^http://(\w{2})\.testyourmight\.com/*"
-          to="https://secure.testyourmight.com/*" />
-          
-  <securecookie host="^testyourmight\.com$" name=".+" />
-          
-</ruleset>

From 99c66e4a31fbb8331701224f9a7a3132436b519a Mon Sep 17 00:00:00 2001
From: Philip Nassr <philip_nassr@yahoo.com>
Date: Thu, 27 Apr 2017 18:57:35 +0100
Subject: [PATCH 05/16] Delete tym.com.xml

Delete Testyourmight rule
---
 src/chrome/content/rules/tym.com.xml | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 src/chrome/content/rules/tym.com.xml

diff --git a/src/chrome/content/rules/tym.com.xml b/src/chrome/content/rules/tym.com.xml
deleted file mode 100644
index 49100b56e21d..000000000000
--- a/src/chrome/content/rules/tym.com.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<!--
-	Nonfunctional hosts in *.testyourmight.com:
-
-	h: http redirect
-	m: certificate mismatch
-	r: connection refused
-	s: self-signed certificate
-	t: timeout on https
--->
-<ruleset name="testyourmight.com">
-	<target host="testyourmight.com" />
-	<target host="www.testyourmight.com" />
-
-	<rule from="^http:" to="https:" />
-</ruleset>

From 7b1b66404fbc94bf53d5d755adf26ebdf6697427 Mon Sep 17 00:00:00 2001
From: pn303 <philip_nassr@yahoo.com>
Date: Thu, 27 Apr 2017 21:34:53 +0100
Subject: [PATCH 06/16] Create new rules

---
 src/chrome/content/rules/Bluesnews.com.xml        | 15 +++++++++++++++
 src/chrome/content/rules/Controllerpro.com.xml    | 15 +++++++++++++++
 src/chrome/content/rules/Gamecritics.com.xml      | 15 +++++++++++++++
 src/chrome/content/rules/Gamegeek-denter.de.xml   | 15 +++++++++++++++
 src/chrome/content/rules/Gamesandpals.com.xml     | 15 +++++++++++++++
 src/chrome/content/rules/Gameselectors.com.xml    | 15 +++++++++++++++
 .../content/rules/Gamewithyourbrain.com.xml       | 15 +++++++++++++++
 src/chrome/content/rules/Howinerd.com.xml         | 15 +++++++++++++++
 src/chrome/content/rules/Pcgamer.com.xml          | 15 +++++++++++++++
 src/chrome/content/rules/Siliconera.com.xml       | 15 +++++++++++++++
 10 files changed, 150 insertions(+)
 create mode 100644 src/chrome/content/rules/Bluesnews.com.xml
 create mode 100644 src/chrome/content/rules/Controllerpro.com.xml
 create mode 100644 src/chrome/content/rules/Gamecritics.com.xml
 create mode 100644 src/chrome/content/rules/Gamegeek-denter.de.xml
 create mode 100644 src/chrome/content/rules/Gamesandpals.com.xml
 create mode 100644 src/chrome/content/rules/Gameselectors.com.xml
 create mode 100644 src/chrome/content/rules/Gamewithyourbrain.com.xml
 create mode 100644 src/chrome/content/rules/Howinerd.com.xml
 create mode 100644 src/chrome/content/rules/Pcgamer.com.xml
 create mode 100644 src/chrome/content/rules/Siliconera.com.xml

diff --git a/src/chrome/content/rules/Bluesnews.com.xml b/src/chrome/content/rules/Bluesnews.com.xml
new file mode 100644
index 000000000000..0175a5f2672f
--- /dev/null
+++ b/src/chrome/content/rules/Bluesnews.com.xml
@@ -0,0 +1,15 @@
+<!--
+	Nonfunctional hosts in *.bluesnews.com:
+
+	h: http redirect
+	m: certificate mismatch
+	r: connection refused
+	s: self-signed certificate
+	t: timeout on https
+-->
+<ruleset name="Bluesnews">
+	<target host="bluesnews.com" />
+	<target host="www.bluesnews.com" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>
diff --git a/src/chrome/content/rules/Controllerpro.com.xml b/src/chrome/content/rules/Controllerpro.com.xml
new file mode 100644
index 000000000000..12633bd17008
--- /dev/null
+++ b/src/chrome/content/rules/Controllerpro.com.xml
@@ -0,0 +1,15 @@
+<!--
+	Nonfunctional hosts in *.controllerpro.com:
+
+	h: http redirect
+	m: certificate mismatch
+	r: connection refused
+	s: self-signed certificate
+	t: timeout on https
+-->
+<ruleset name="Controllerpro">
+	<target host="controllerpro.com" />
+	<target host="www.controllerpro.com" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>
diff --git a/src/chrome/content/rules/Gamecritics.com.xml b/src/chrome/content/rules/Gamecritics.com.xml
new file mode 100644
index 000000000000..5ee3d31cfa52
--- /dev/null
+++ b/src/chrome/content/rules/Gamecritics.com.xml
@@ -0,0 +1,15 @@
+<!--
+	Nonfunctional hosts in *.gamecritics.com:
+
+	h: http redirect
+	m: certificate mismatch
+	r: connection refused
+	s: self-signed certificate
+	t: timeout on https
+-->
+<ruleset name="Gamecritics">
+	<target host="gamecritics.com" />
+	<target host="www.gamecritics.com" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>
diff --git a/src/chrome/content/rules/Gamegeek-denter.de.xml b/src/chrome/content/rules/Gamegeek-denter.de.xml
new file mode 100644
index 000000000000..057980d419a2
--- /dev/null
+++ b/src/chrome/content/rules/Gamegeek-denter.de.xml
@@ -0,0 +1,15 @@
+<!--
+	Nonfunctional hosts in *.gamegeek-denter.de:
+
+	h: http redirect
+	m: certificate mismatch
+	r: connection refused
+	s: self-signed certificate
+	t: timeout on https
+-->
+<ruleset name="Gamegeek-denter">
+	<target host="gamegeek-denter.de" />
+	<target host="www.gamegeek-denter.de" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>
diff --git a/src/chrome/content/rules/Gamesandpals.com.xml b/src/chrome/content/rules/Gamesandpals.com.xml
new file mode 100644
index 000000000000..d0f0b7cb1cb7
--- /dev/null
+++ b/src/chrome/content/rules/Gamesandpals.com.xml
@@ -0,0 +1,15 @@
+<!--
+	Nonfunctional hosts in *.gamesandpals.com:
+
+	h: http redirect
+	m: certificate mismatch
+	r: connection refused
+	s: self-signed certificate
+	t: timeout on https
+-->
+<ruleset name="Gamesandpals">
+	<target host="gamesandpals.com" />
+	<target host="www.gamesandpals.com" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>
diff --git a/src/chrome/content/rules/Gameselectors.com.xml b/src/chrome/content/rules/Gameselectors.com.xml
new file mode 100644
index 000000000000..e92d0cdbcc4c
--- /dev/null
+++ b/src/chrome/content/rules/Gameselectors.com.xml
@@ -0,0 +1,15 @@
+<!--
+	Nonfunctional hosts in *.gameselectors.com:
+
+	h: http redirect
+	m: certificate mismatch
+	r: connection refused
+	s: self-signed certificate
+	t: timeout on https
+-->
+<ruleset name="Gameselectors">
+	<target host="gameselectors.com" />
+	<target host="www.gameselectors.com" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>
diff --git a/src/chrome/content/rules/Gamewithyourbrain.com.xml b/src/chrome/content/rules/Gamewithyourbrain.com.xml
new file mode 100644
index 000000000000..955a9af51a84
--- /dev/null
+++ b/src/chrome/content/rules/Gamewithyourbrain.com.xml
@@ -0,0 +1,15 @@
+<!--
+	Nonfunctional hosts in *.gamewithyourbrain.com:
+
+	h: http redirect
+	m: certificate mismatch
+	r: connection refused
+	s: self-signed certificate
+	t: timeout on https
+-->
+<ruleset name="Gamewithyourbrain">
+	<target host="gamewithyourbrain.com" />
+	<target host="www.gamewithyourbrain.com" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>
diff --git a/src/chrome/content/rules/Howinerd.com.xml b/src/chrome/content/rules/Howinerd.com.xml
new file mode 100644
index 000000000000..b471d5fa122e
--- /dev/null
+++ b/src/chrome/content/rules/Howinerd.com.xml
@@ -0,0 +1,15 @@
+<!--
+	Nonfunctional hosts in *.howinerd.com:
+
+	h: http redirect
+	m: certificate mismatch
+	r: connection refused
+	s: self-signed certificate
+	t: timeout on https
+-->
+<ruleset name="Howinerd.com">
+	<target host="howinerd.com" />
+	<target host="www.howinerd.com" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>
diff --git a/src/chrome/content/rules/Pcgamer.com.xml b/src/chrome/content/rules/Pcgamer.com.xml
new file mode 100644
index 000000000000..f365dacf6413
--- /dev/null
+++ b/src/chrome/content/rules/Pcgamer.com.xml
@@ -0,0 +1,15 @@
+<!--
+	Nonfunctional hosts in *.pcgamer.com:
+
+	h: http redirect
+	m: certificate mismatch
+	r: connection refused
+	s: self-signed certificate
+	t: timeout on https
+-->
+<ruleset name="Pcgamer">
+	<target host="pcgamer.com" />
+	<target host="www.pcgamer.com" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>
diff --git a/src/chrome/content/rules/Siliconera.com.xml b/src/chrome/content/rules/Siliconera.com.xml
new file mode 100644
index 000000000000..1cbc358913dd
--- /dev/null
+++ b/src/chrome/content/rules/Siliconera.com.xml
@@ -0,0 +1,15 @@
+<!--
+	Nonfunctional hosts in *.siliconera.com:
+
+	h: http redirect
+	m: certificate mismatch
+	r: connection refused
+	s: self-signed certificate
+	t: timeout on https
+-->
+<ruleset name="Siliconera">
+	<target host="siliconera.com" />
+	<target host="www.siliconera.com" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>

From 8af5fb418958ef25e74e607249f0766f7f417be2 Mon Sep 17 00:00:00 2001
From: pn303 <philip_nassr@yahoo.com>
Date: Fri, 28 Apr 2017 11:46:17 +0100
Subject: [PATCH 07/16] Create rule for Gamerswithjobs

---
 src/chrome/content/rules/Gamerswithjobs.com.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 src/chrome/content/rules/Gamerswithjobs.com.xml

diff --git a/src/chrome/content/rules/Gamerswithjobs.com.xml b/src/chrome/content/rules/Gamerswithjobs.com.xml
new file mode 100644
index 000000000000..51e8da2d8725
--- /dev/null
+++ b/src/chrome/content/rules/Gamerswithjobs.com.xml
@@ -0,0 +1,15 @@
+<!--
+	Nonfunctional hosts in *.gamerswithjobs.com:
+
+	h: http redirect
+	m: certificate mismatch
+	r: connection refused
+	s: self-signed certificate
+	t: timeout on https
+-->
+<ruleset name="Gamerswithjobs">
+	<target host="gamerswithjobs.com" />
+	<target host="www.gamerswithjobs.com" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>

From 535bb2df5ffa3036f00b38380ecfacbd235d6fb8 Mon Sep 17 00:00:00 2001
From: pn303 <philip_nassr@yahoo.com>
Date: Fri, 28 Apr 2017 11:47:13 +0100
Subject: [PATCH 08/16] Create rule for Eventhubs

---
 src/chrome/content/rules/Eventhubs.com.xml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 src/chrome/content/rules/Eventhubs.com.xml

diff --git a/src/chrome/content/rules/Eventhubs.com.xml b/src/chrome/content/rules/Eventhubs.com.xml
new file mode 100644
index 000000000000..e72af99755f2
--- /dev/null
+++ b/src/chrome/content/rules/Eventhubs.com.xml
@@ -0,0 +1,20 @@
+<!--
+	Nonfunctional hosts in *.eventhubs.com:
+
+	h: http redirect
+	m: certificate mismatch
+	r: connection refused
+	s: self-signed certificate
+	t: timeout on https
+-->
+<ruleset name="Eventhubs">
+	<target host="eventhubs.com" />
+	<target host="www.eventhubs.com" />
+        <target host="forums.eventhubs.com" />
+
+	<rule from="^http:" to="https:" />
+	
+	<test url="http://eventhubs.com/" />
+	<test url="http://www.eventhubs.com/" />
+	<test url="http://forums.eventhubs.com/" />
+</ruleset>

From 538631c13446fc97b00c5c19a70b869f797723f9 Mon Sep 17 00:00:00 2001
From: pn303 <philip_nassr@yahoo.com>
Date: Sat, 29 Apr 2017 16:07:40 +0100
Subject: [PATCH 09/16] Create rule for 148apps.com

---
 src/chrome/content/rules/148apps.com.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 src/chrome/content/rules/148apps.com.xml

diff --git a/src/chrome/content/rules/148apps.com.xml b/src/chrome/content/rules/148apps.com.xml
new file mode 100644
index 000000000000..34fd4659d703
--- /dev/null
+++ b/src/chrome/content/rules/148apps.com.xml
@@ -0,0 +1,15 @@
+<!--
+	Nonfunctional hosts in *.148apps.com:
+
+	h: http redirect
+	m: certificate mismatch
+	r: connection refused
+	s: self-signed certificate
+	t: timeout on https
+-->
+<ruleset name="148apps">
+	<target host="148apps.com" />
+	<target host="www.148apps.com" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>

From 85fa1e0558e31f2b803d65cf6cffa7e67fb602ec Mon Sep 17 00:00:00 2001
From: pn303 <philip_nassr@yahoo.com>
Date: Sat, 29 Apr 2017 16:08:16 +0100
Subject: [PATCH 10/16] Create rule for pocketgamer.co.uk

---
 src/chrome/content/rules/Pocketgamer.co.uk.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 src/chrome/content/rules/Pocketgamer.co.uk.xml

diff --git a/src/chrome/content/rules/Pocketgamer.co.uk.xml b/src/chrome/content/rules/Pocketgamer.co.uk.xml
new file mode 100644
index 000000000000..c0f2037223ae
--- /dev/null
+++ b/src/chrome/content/rules/Pocketgamer.co.uk.xml
@@ -0,0 +1,16 @@
+<!--
+	Nonfunctional hosts in *.pocketgamer.co.uk:
+
+	h: http redirect
+	m: certificate mismatch
+	r: connection refused
+	s: self-signed certificate
+	t: timeout on https
+-->
+<ruleset name="Pocketgamer">
+	<target host="pocketgamer.co.uk" />
+	<target host="www.pocketgamer.co.uk" />
+	<target host="hubs.pocketgamer.co.uk" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>

From 7e81fc03594a16f44787d9fa465040e86947b007 Mon Sep 17 00:00:00 2001
From: pn303 <philip_nassr@yahoo.com>
Date: Sat, 29 Apr 2017 16:09:02 +0100
Subject: [PATCH 11/16] Create rule for pocketgamer.biz

---
 src/chrome/content/rules/Pocketgamer.biz.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 src/chrome/content/rules/Pocketgamer.biz.xml

diff --git a/src/chrome/content/rules/Pocketgamer.biz.xml b/src/chrome/content/rules/Pocketgamer.biz.xml
new file mode 100644
index 000000000000..0d621b4b87c4
--- /dev/null
+++ b/src/chrome/content/rules/Pocketgamer.biz.xml
@@ -0,0 +1,15 @@
+<!--
+	Nonfunctional hosts in *.pocketgamer.biz:
+
+	h: http redirect
+	m: certificate mismatch
+	r: connection refused
+	s: self-signed certificate
+	t: timeout on https
+-->
+<ruleset name="Pocketgamer.biz">
+	<target host="pocketgamer.biz" />
+	<target host="www.pocketgamer.biz" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>

From 5b1ec6dbba0cb204f97a1099dafc776b47dbf8db Mon Sep 17 00:00:00 2001
From: pn303 <philip_nassr@yahoo.com>
Date: Sat, 29 Apr 2017 16:07:40 +0100
Subject: [PATCH 12/16] Create rule for 148apps.com

---
 src/chrome/content/rules/148apps.com.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 src/chrome/content/rules/148apps.com.xml

diff --git a/src/chrome/content/rules/148apps.com.xml b/src/chrome/content/rules/148apps.com.xml
new file mode 100644
index 000000000000..34fd4659d703
--- /dev/null
+++ b/src/chrome/content/rules/148apps.com.xml
@@ -0,0 +1,15 @@
+<!--
+	Nonfunctional hosts in *.148apps.com:
+
+	h: http redirect
+	m: certificate mismatch
+	r: connection refused
+	s: self-signed certificate
+	t: timeout on https
+-->
+<ruleset name="148apps">
+	<target host="148apps.com" />
+	<target host="www.148apps.com" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>

From c72cc837f16bd2de64c61233df0c1b27858bd690 Mon Sep 17 00:00:00 2001
From: pn303 <philip_nassr@yahoo.com>
Date: Sat, 29 Apr 2017 16:08:16 +0100
Subject: [PATCH 13/16] Create rule for pocketgamer.co.uk

---
 src/chrome/content/rules/Pocketgamer.co.uk.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 src/chrome/content/rules/Pocketgamer.co.uk.xml

diff --git a/src/chrome/content/rules/Pocketgamer.co.uk.xml b/src/chrome/content/rules/Pocketgamer.co.uk.xml
new file mode 100644
index 000000000000..c0f2037223ae
--- /dev/null
+++ b/src/chrome/content/rules/Pocketgamer.co.uk.xml
@@ -0,0 +1,16 @@
+<!--
+	Nonfunctional hosts in *.pocketgamer.co.uk:
+
+	h: http redirect
+	m: certificate mismatch
+	r: connection refused
+	s: self-signed certificate
+	t: timeout on https
+-->
+<ruleset name="Pocketgamer">
+	<target host="pocketgamer.co.uk" />
+	<target host="www.pocketgamer.co.uk" />
+	<target host="hubs.pocketgamer.co.uk" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>

From d589211b043eaa4f6edd739f368bf44843d369c2 Mon Sep 17 00:00:00 2001
From: pn303 <philip_nassr@yahoo.com>
Date: Sat, 29 Apr 2017 16:09:02 +0100
Subject: [PATCH 14/16] Create rule for pocketgamer.biz

---
 src/chrome/content/rules/Pocketgamer.biz.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 src/chrome/content/rules/Pocketgamer.biz.xml

diff --git a/src/chrome/content/rules/Pocketgamer.biz.xml b/src/chrome/content/rules/Pocketgamer.biz.xml
new file mode 100644
index 000000000000..0d621b4b87c4
--- /dev/null
+++ b/src/chrome/content/rules/Pocketgamer.biz.xml
@@ -0,0 +1,15 @@
+<!--
+	Nonfunctional hosts in *.pocketgamer.biz:
+
+	h: http redirect
+	m: certificate mismatch
+	r: connection refused
+	s: self-signed certificate
+	t: timeout on https
+-->
+<ruleset name="Pocketgamer.biz">
+	<target host="pocketgamer.biz" />
+	<target host="www.pocketgamer.biz" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>

From 87f7d66de7915f919f300f7f2ea069d23296e66e Mon Sep 17 00:00:00 2001
From: pn303 <philip_nassr@yahoo.com>
Date: Sat, 29 Apr 2017 16:09:02 +0100
Subject: [PATCH 15/16] Create rule for pocketgamer.biz


From eeee091ef4733077a0734350c4ba1fbd33eaba14 Mon Sep 17 00:00:00 2001
From: Pasu Chan <cschanaj@users.noreply.github.com>
Date: Sat, 29 Apr 2017 23:53:14 +0800
Subject: [PATCH 16/16] Update NUUG.no.xml (#9674)

---
 .../content/rules/NUUG.no-falsemixed.xml      |  17 ---
 .../content/rules/NUUG.no-problematic.xml     |  14 --
 src/chrome/content/rules/NUUG.no.xml          | 127 ++++++++----------
 3 files changed, 53 insertions(+), 105 deletions(-)
 delete mode 100644 src/chrome/content/rules/NUUG.no-falsemixed.xml
 delete mode 100644 src/chrome/content/rules/NUUG.no-problematic.xml

diff --git a/src/chrome/content/rules/NUUG.no-falsemixed.xml b/src/chrome/content/rules/NUUG.no-falsemixed.xml
deleted file mode 100644
index 475d3e996015..000000000000
--- a/src/chrome/content/rules/NUUG.no-falsemixed.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<!--
-	For rules not causing false/broken MCB, see NUUG.no.xml.
-
--->
-<ruleset name="NUUG.no (false MCB)" platform="cacert mixedcontent">
-
-	<target host="memberdb.nuug.no" />
-		<!--
-			Handled in NUUG.no.xml:
-						-->
-		<!--exclusion pattern="^http://memberdb\.nuug\.no/+(?!favicon\.ico|global\.css)" /-->
-
-
-	<rule from="^http://memberdb\.nuug\.no/(?=favicon\.ico|/*global\.css)"
-		to="https://memberdb.nuug.no/" />
-
-</ruleset>
diff --git a/src/chrome/content/rules/NUUG.no-problematic.xml b/src/chrome/content/rules/NUUG.no-problematic.xml
deleted file mode 100644
index 5e59130a788b..000000000000
--- a/src/chrome/content/rules/NUUG.no-problematic.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<!--
-	For rules that are on by default, see NUUG.no.xml.
-
--->
-<ruleset name="NUUG.no (problematic)" default_off="mismatched" platform="cacert">
-
-	<target host="planet.nuug.no" />
-	<target host="wiki.nuug.no" />
-
-
-	<rule from="^http://(planet|wiki)\.nuug\.no/"
-		to="https://$1.nuug.no/" />
-
-</ruleset>
diff --git a/src/chrome/content/rules/NUUG.no.xml b/src/chrome/content/rules/NUUG.no.xml
index 050e4c4cdaf0..0855321d4482 100644
--- a/src/chrome/content/rules/NUUG.no.xml
+++ b/src/chrome/content/rules/NUUG.no.xml
@@ -1,83 +1,62 @@
 <!--
-	For rules causing false/broken MCB, see NUUG.no-falsemixed.xml.
-
-	For problematic rules, see NUUG.no-problematic.xml.
-
-
-	Problematic subdomains:
-
-		- planet *
-		- wiki *
-
-	* Works; mismatched, CN: nerdhaven.nuug.no
-
-
-	Partially covered subdomains:
-
-		- memberdb	(avoiding false/broken MCB)
-
-
-	Fully covered subdomains:
-
-		- (www.)
-		- approve
-		- lists
-		- nerdhaven
-		- rt
-
-
-	Mixed content:
-
-		- Video on www from player.vimeo.com ¹
-
-		- Images, on:
-
-			- planet, from:
-
-				- planet ¹
-				- www ¹
-				- (www.)bekkelund.net ²
-				- \d.bp.blogspot.com ¹
-				- www.devolo.com ¹
-				- blogg.friprog.no ²
-				- www.hdwallpapersinn.com ²
-				- www.southafrica.net ²
-				- www.wired.com ²
-
-			- wiki from wiki ¹
-
-	¹ Secured by us
-	² Unsecurable
-
+	Non-functional hosts
+		Couldn't connect to server:
+			 - archiver.nuug.no
+			 - dugnadsnett.nuug.no
+			 - fiksgatami-prod.nuug.no
+			 - fiksgatami2-dev.nuug.no
+			 - frikanalen.nuug.no
+			 - mapit.nuug.no
+			 - master.nuug.no
+			 - master2.nuug.no
+			 - portal.nuug.no
+			 - scraper.nuug.no
+			 - vert.nuug.no
+
+		Timeout was reached:
+			 - cserv.nuug.no
+			 - fiksgatami-dev.nuug.no
+			 - fiksgatami2-prod.nuug.no
+			 - sqldb.nuug.no
+
+		SSL peer certificate was not OK:
+			 - alaveteli-prod.nuug.no
+			 - bsd.nuug.no
+			 - foundation.nuug.no
+			 - freebsd.nuug.no
+			 - haugalandlug.nuug.no
+			 - login.nuug.no
+			 - munin.nuug.no
+			 - mx1.nuug.no
+			 - ns1.nuug.no
+			 - openbsd.nuug.no
+
+		Peer certificate cannot be authenticated with given CA certificates:
+			 - frikanalen-dev.nuug.no
+			 - tjener.nuug.no
+
+		Status code mismatch:
+			 - video.nuug.no (require auth)
+
+		4xx client error:
+			 - approve.nuug.no
+
+		5xx server error:
+			 - varnish.nuug.no
 -->
-<ruleset name="NUUG.no (partial)" platform="cacert">
-
-	<!--	Direct rewrites:
-				-->
+<ruleset name="NUUG.no">
 	<target host="nuug.no" />
-	<target host="approve.nuug.no" />
+	<target host="www.nuug.no" />
+	<target host="alaveteli-dev.nuug.no" />
+	<target host="home.nuug.no" />
+	<target host="hotell.nuug.no" />
 	<target host="lists.nuug.no" />
 	<target host="memberdb.nuug.no" />
 	<target host="nerdhaven.nuug.no" />
+	<target host="piwik.nuug.no" />
+	<target host="planet.nuug.no" />
 	<target host="rt.nuug.no" />
-	<target host="www.nuug.no" />
-
-		<!--	Avoid false/broken MCB:
-						-->
-		<exclusion pattern="^http://memberdb\.nuug\.no/+(?!favicon\.ico|global\.css)" />
-
-			<!--	+ve:
-					-->
-			<test url="http://memberdb.nuug.no/?page=edit-member" />
-			<test url="http://memberdb.nuug.no/?page=index" />
-			<test url="http://memberdb.nuug.no/?page=signup" />
-
-			<!--	-ve:
-					-->
-			<test url="http://memberdb.nuug.no//global.css" />
-
-
-	<rule from="^http:"
-		to="https:" />
+	<target host="wiki.nuug.no" />
 
+	<rule from="^http:" to="https:" />
 </ruleset>