From f84058ca5f6081f65e3f3ac9c96f0169a38ed985 Mon Sep 17 00:00:00 2001
From: gloomy-ghost <gloomy-ghost@users.noreply.github.com>
Date: Tue, 9 May 2017 11:32:50 +1200
Subject: [PATCH] Update Upaiyun.com.xml (#8198)

* Update Upaiyun.com.xml

* Update Upaiyun.com.xml

* Split upyun.com

* Update Upaiyun.com.xml and Upyun.com.xml
---
 src/chrome/content/rules/Upaiyun.com.xml | 12 ++++++++-
 src/chrome/content/rules/Upyun.com.xml   | 32 ++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 src/chrome/content/rules/Upyun.com.xml

diff --git a/src/chrome/content/rules/Upaiyun.com.xml b/src/chrome/content/rules/Upaiyun.com.xml
index 8f98e8af383d..160abd5728e4 100644
--- a/src/chrome/content/rules/Upaiyun.com.xml
+++ b/src/chrome/content/rules/Upaiyun.com.xml
@@ -1,9 +1,18 @@
+<!--
+	See also: Upyun.com.xml
+
+	Invalid certificate:
+		- upaiyun.com
+		- www.upaiyun.com
+
+-->
 <ruleset name="Upaiyun.com">
+	<target host="www.upaiyun.com" />
 	<target host="*.b0.upaiyun.com" />
 		<test url="http://ko-avatar.b0.upaiyun.com/default/17.png" />
 		<test url="http://ko-avatar.b0.upaiyun.com/default/18.png" />
 		<test url="http://ko-site-cdn.b0.upaiyun.com/" />
-		<test url="http://making-photos.b0.upaiyun.com/" />
+		<test url="http://making-photos.b0.upaiyun.com/photos/c114e153bd2bedbc7594801ddc10ce28.jpg" />
 		<test url="http://mgpyh.b0.upaiyun.com/post_image/a78ea44062d5ee10bc3ef862f8078f9e.jpg" />
 
 	<!--	Refused:	-->
@@ -12,5 +21,6 @@
 		<test url="http://honggc.b0.upaiyun.com/romantic-words/" />
 		<test url="http://wxrss.b0.upaiyun.com/14866062155YniKI.jpg" />
 
+	<rule from="^http://www\.upaiyun\.com/" to="https://www.upyun.com/" />
 	<rule from="^http:" to="https:" />
 </ruleset>
diff --git a/src/chrome/content/rules/Upyun.com.xml b/src/chrome/content/rules/Upyun.com.xml
new file mode 100644
index 000000000000..d1928e00b290
--- /dev/null
+++ b/src/chrome/content/rules/Upyun.com.xml
@@ -0,0 +1,32 @@
+<!--
+	See also: Upaiyun.com.xml
+
+	Different HTTP/HTTPS content:
+		- useco.upyun.com
+		- wiki.upyun.com
+		- yule.upyun.com
+
+	Invalid Certificate:
+		- io.upyun.com
+		- yule.m.upyun.com
+		- support.upyun.com
+
+	Refused:
+		- purge.upyun.com
+		- updog.upyun.com
+
+-->
+<ruleset name="Upyun.com">
+	<target host="upyun.com" />
+	<target host="www.upyun.com" />
+	<target host="blog.upyun.com" />
+	<target host="console.upyun.com" />
+	<target host="docs.upyun.com" />
+	<target host="madoka.upyun.com" />
+	<target host="nola.upyun.com" />
+	<target host="opentalk.upyun.com" />
+	<target host="ptp-admin.upyun.com" />
+	<target host="robin.upyun.com" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>