From e311207551a7c973537727628124b5d4d8326e71 Mon Sep 17 00:00:00 2001
From: cschanaj <cschanaj@users.noreply.github.com>
Date: Sun, 13 Sep 2020 11:10:05 +0200
Subject: [PATCH 1/2] Rename and update Ecwid.com.xml

---
 src/chrome/content/rules/Ecwid.com.xml | 20 +++++++++
 src/chrome/content/rules/Ecwid.xml     | 60 --------------------------
 2 files changed, 20 insertions(+), 60 deletions(-)
 create mode 100644 src/chrome/content/rules/Ecwid.com.xml
 delete mode 100644 src/chrome/content/rules/Ecwid.xml

diff --git a/src/chrome/content/rules/Ecwid.com.xml b/src/chrome/content/rules/Ecwid.com.xml
new file mode 100644
index 000000000000..072d9119294e
--- /dev/null
+++ b/src/chrome/content/rules/Ecwid.com.xml
@@ -0,0 +1,20 @@
+<!--
+	Non-functional hosts:
+		Incomplete certificate chain error:
+		- ideas.ecwid.com
+-->
+<ruleset name="Ecwid.com (partial)">
+
+	<target host="ecwid.com" />
+	<target host="www.ecwid.com" />
+	<target host="images-cdn.ecwid.com" />
+	<target host="kb.ecwid.com" />
+	<target host="my.ecwid.com" />
+	<target host="static.ecwid.com" />
+	<target host="support.ecwid.com" />
+
+	<securecookie host=".+" name=".+" />
+
+	<rule from="^http:" to="https:" />
+
+</ruleset>
diff --git a/src/chrome/content/rules/Ecwid.xml b/src/chrome/content/rules/Ecwid.xml
deleted file mode 100644
index ff77d4eaaa6f..000000000000
--- a/src/chrome/content/rules/Ecwid.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<!--
-	CDN buckets:
-
-		- dj925myfyz5v.cloudfront.net
-
-			- static.ecwid.com
-
-		- dpbfm6h358sh7.cloudfront.net
-
-			- images-cdn.ecwid.com
-
-		- ecwid.desk.com
-
-			- help.ecwid.com
-
-		- ecwid.pbworks.com
-
-			- kb.ecwid.com
-
-		- ecwid.uservoice.com
-
-			- ideas.ecwid.com
-
-
-	Nonfunctional subdomains:
-
-		- (www.)	(redirects to http)
-		- help		(redirects to http; mismatched, CN: *.assistly.com)
-		- kb		(redirects to http; mismatched, CN: *.pbworks.com)
-
-
-	Problematic subdomains:
-
-		- ideas		(works; mismatched, CN: *.uservoice.com)
-
--->
-<ruleset name="Ecwid (partial)">
-
-	<target host="images-cdn.ecwid.com" />
-	<target host="kb.ecwid.com" />
-	<target host="my.ecwid.com" />
-	<target host="static.ecwid.com" />
-
-
-	<securecookie host="^my\.ecwid\.com$" name=".+" />
-
-
-	<rule from="^http://images-cdn\.ecwid\.com/"
-		to="https://dpbfm6h358sh7.cloudfront.net/" />
-
-	<rule from="^http://kb\.ecwid\.com/(f/|theme_image\.php)"
-		to="https://ecwid.pbworks.com/$1" />
-
-	<rule from="^http://my\.ecwid\.com/"
-		to="https://my.ecwid.com/" />
-
-	<rule from="^http://static\.ecwid\.com/"
-		to="https://dj925myfyz5v.cloudfront.net/" />
-
-</ruleset>

From 5fd0ca3188fd15a25efb35e36c60a5ee38608f9d Mon Sep 17 00:00:00 2001
From: Chan Chak Shing <cschanaj@users.noreply.github.com>
Date: Thu, 8 Oct 2020 14:49:54 +0200
Subject: [PATCH 2/2] Update Ecwid.com.xml

---
 src/chrome/content/rules/Ecwid.com.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/chrome/content/rules/Ecwid.com.xml b/src/chrome/content/rules/Ecwid.com.xml
index 072d9119294e..2754efd0960d 100644
--- a/src/chrome/content/rules/Ecwid.com.xml
+++ b/src/chrome/content/rules/Ecwid.com.xml
@@ -1,4 +1,7 @@
 <!--
+	Note: each customer of ecwid.com get its own subdomains,
+		at least some of them support HTTPS properly.
+
 	Non-functional hosts:
 		Incomplete certificate chain error:
 		- ideas.ecwid.com