From d7ca2f8768fed347f6132a4cb98bd54c4d7163bb Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 26 Jan 2025 23:19:44 +0100
Subject: [PATCH] Doc force-https (#7259)

* Doc force-https
https://github.com/FreshRSS/FreshRSS/discussions/7252#discussioncomment-11951183

* Forgotten ^

* More proper support for comments
---
 force-https.default.txt | 4 ++++
 lib/lib_rss.php         | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/force-https.default.txt b/force-https.default.txt
index 48c0461b2..0edbc7f08 100644
--- a/force-https.default.txt
+++ b/force-https.default.txt
@@ -1,3 +1,7 @@
+# Do not modify this file, which defines default values,
+# but specify your own values in ./data/force-https.txt
+# Examples of values, one per line: com, example.org, www.example.net
+
 blogger.com
 creativecommons.org
 dailymotion.com
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index f0a070820..99c72cb49 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -390,6 +390,11 @@ function customSimplePie(array $attributes = [], array $curl_options = []): \Sim
 	if (is_array($force)) {
 		$https_domains = array_merge($https_domains, $force);
 	}
+
+	// Remove whitespace and comments starting with # / ;
+	$https_domains = preg_replace('%\\s+|[\/#;].*$%', '', $https_domains) ?? $https_domains;
+	$https_domains = array_filter($https_domains, fn(string $v) => $v !== '');
+
 	$simplePie->set_https_domains($https_domains);
 	return $simplePie;
 }