From 3cd90a2b1f1ad4f55b494de2019d2ed915bb79c6 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 25 May 2024 18:27:12 +0200
Subject: Fix HTTP GET curl options (#6492)

fix https://github.com/FreshRSS/FreshRSS/issues/6491
Regression from https://github.com/FreshRSS/FreshRSS/pull/6177
---
 app/Models/Entry.php | 2 +-
 app/Models/Feed.php  | 1 +
 lib/favicons.php     | 1 +
 lib/lib_rss.php      | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/Models/Entry.php b/app/Models/Entry.php
index ca8d9c602..ad480f3e6 100644
--- a/app/Models/Entry.php
+++ b/app/Models/Entry.php
@@ -719,7 +719,7 @@ HTML;
 		}
 
 		$cachePath = $feed->cacheFilename($url . '#' . $feed->pathEntries());
-		$html = httpGet($url, $cachePath, 'html');
+		$html = httpGet($url, $cachePath, 'html', $feed->attributes(), $feed->curlOptions());
 		if (strlen($html) > 0) {
 			$doc = new DOMDocument();
 			$doc->loadHTML($html, LIBXML_NONET | LIBXML_NOERROR | LIBXML_NOWARNING);
diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index 5450d78c6..625c3c931 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -1058,6 +1058,7 @@ class FreshRSS_Feed extends Minz_Model {
 				CURLOPT_MAXREDIRS => 10,
 				CURLOPT_FOLLOWLOCATION => true,
 				CURLOPT_ENCODING => '',	//Enable all encodings
+				//CURLOPT_VERBOSE => 1,	// To debug sent HTTP headers
 			]);
 			$response = curl_exec($ch);
 			$info = curl_getinfo($ch);
diff --git a/lib/favicons.php b/lib/favicons.php
index 8bfa8e001..53cc9f759 100644
--- a/lib/favicons.php
+++ b/lib/favicons.php
@@ -38,6 +38,7 @@ function downloadHttp(string &$url, array $curlOptions = []): string {
 			CURLOPT_MAXREDIRS => 10,
 			CURLOPT_FOLLOWLOCATION => true,
 			CURLOPT_ENCODING => '',	//Enable all encodings
+			//CURLOPT_VERBOSE => 1,	// To debug sent HTTP headers
 		]);
 
 	FreshRSS_Context::initSystem();
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 22da0b98e..6bceccc86 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -544,6 +544,7 @@ function httpGet(string $url, string $cachePath, string $type = 'html', array $a
 		CURLOPT_RETURNTRANSFER => true,
 		CURLOPT_FOLLOWLOCATION => true,
 		CURLOPT_ENCODING => '',	//Enable all encodings
+		//CURLOPT_VERBOSE => 1,	// To debug sent HTTP headers
 	]);
 
 	curl_setopt_array($ch, FreshRSS_Context::systemConf()->curl_options);
-- 
cgit v1.2.3