From be7ae7879616437f2df771f6c977735563e2b284 Mon Sep 17 00:00:00 2001
From: Pasu <cschanaj@users.noreply.github.com>
Date: Tue, 9 May 2017 06:01:22 +0800
Subject: [PATCH] Update XFCE.org.xml (#9832)

---
 .../content/rules/XFCE.org-self-signed.xml    | 15 ----
 src/chrome/content/rules/XFCE.org.xml         | 85 ++++++++++---------
 2 files changed, 45 insertions(+), 55 deletions(-)
 delete mode 100644 src/chrome/content/rules/XFCE.org-self-signed.xml

diff --git a/src/chrome/content/rules/XFCE.org-self-signed.xml b/src/chrome/content/rules/XFCE.org-self-signed.xml
deleted file mode 100644
index 00993b6de339..000000000000
--- a/src/chrome/content/rules/XFCE.org-self-signed.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<!--
-	For rules that are on by default, see XFCE.org.xml.
-
--->
-<ruleset name="XFCE.org (self-signed)" default_off="self-signed">
-
-	<!--	Direct rewrites:
-				-->
-	<target host="tibeti.xfce.org" />
-
-
-	<rule from="^http:"
-		to="https:" />
-
-</ruleset>
diff --git a/src/chrome/content/rules/XFCE.org.xml b/src/chrome/content/rules/XFCE.org.xml
index d02f18fd67ff..c4c5d00fc6c1 100644
--- a/src/chrome/content/rules/XFCE.org.xml
+++ b/src/chrome/content/rules/XFCE.org.xml
@@ -1,49 +1,54 @@
 <!--
-	See XFCE.org-self-signed.xml for problematic rules.
-
-
-	Nonfunctional subdomains:
-
-		- ^ *
-		- archive(.be) *
-		- blog *
-		- cdn *
-		- docs *
-		- git *
-		- goodies *
-		- squeeze *
-		- users *
-
-	* 404
-
-
-	Problematic subdomains:
-
-		- tibeti *
-
-	* Self-signed
-
-
-	Fully covered hosts in *xfce.org:
-
-		- bugzilla
-		- forum
-		- wiki
-
+	Non-functional hosts
+		SSL peer certificate was not OK:
+			 - archive.al-us.xfce.org
+			 - archive.xfce.org
+			 - archive.be.xfce.org
+			 - bugs.xfce.org
+			 - buildbot.xfce.org
+			 - foundation.xfce.org
+			 - geoip.xfce.org
+			 - i18n.xfce.org
+			 - installit.xfce.org
+			 - ns1.xfce.org
+			 - ns2.xfce.org
+			 - ns4.xfce.org
+			 - pyxfce.xfce.org
+			 - squeeze.xfce.org
+			 - svn.xfce.org
+			 - thunar.xfce.org
+			 - translations.xfce.org
+			 - www.tx-us.xfce.org
+			 - www.us.xfce.org
+			 - users.xfce.org
+			 - www-test.xfce.org
+			 - xfc.xfce.org
+
+		Peer certificate cannot be authenticated with given CA certificates:
+			 - archive.be2.xfce.org
+			 - earlgrey.xfce.org
+
+		Different content:
+			 - releases.xfce.org
+
+		Mixed content blocking (MCB) tiggered:
+			 - from ajax.googleapis.com on blog.xfce.org
 -->
 <ruleset name="XFCE.org (partial)">
-
-	<!--	Direct rewrites:
-				-->
+	<target host="xfce.org" />
+	<target host="www.xfce.org" />
+	<target host="bug-attachment.xfce.org" />
 	<target host="bugzilla.xfce.org" />
+	<target host="cdn.xfce.org" />
+	<target host="docs.xfce.org" />
 	<target host="forum.xfce.org" />
+	<target host="git.xfce.org" />
+	<target host="goodies.xfce.org" />
+	<target host="mail.xfce.org" />
+	<target host="tibeti.xfce.org" />
 	<target host="wiki.xfce.org" />
 
+	<securecookie host=".+" name=".+" />
 
-	<securecookie host="^(?:.*\.)xfce\.org$" name=".+" />
-
-
-	<rule from="^http:"
-	        to="https:" />
-
+	<rule from="^http:" to="https:" />
 </ruleset>