Fix HTTP GET curl options (FreshRSS#6492)

fix FreshRSS#6491 Regression from FreshRSS#6177
Alkarex · May 25, 2024 · 3cd90a2 · 3cd90a2
1 parent 3e7054b
commit 3cd90a2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/app/Models/Entry.php b/app/Models/Entry.php
@@ -719,7 +719,7 @@ public function getContentByParsing(string $url = '', int $maxRedirs = 3): strin
 		}
 
 		$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
@@ -1058,6 +1058,7 @@ public function pubSubHubbubSubscribe(bool $state): bool {
 				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
@@ -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
@@ -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);