From 091a7785b260564feb2b99f25efb584849e63d72 Mon Sep 17 00:00:00 2001
From: pezcurrel <pezcurrel@tiscali.it>
Date: Tue, 2 Jan 2024 01:05:51 +0100
Subject: [PATCH] =?UTF-8?q?Made=20certain=20=E2=80=9Cconntimeout=E2=80=9D?=
 =?UTF-8?q?=20and=20=E2=80=9Cfunctimeout=E2=80=9D=20get=20passed=20as=20in?=
 =?UTF-8?q?tegers=20to=20curl;=20added=20firefox=20121.0=20user=20agent=20?=
 =?UTF-8?q?as=20user=20agent;=20added=20an=20unused=20curlprogess=20functi?=
 =?UTF-8?q?on,=20just=20so?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/lib/gurl.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/web/lib/gurl.php b/web/lib/gurl.php
index fae0716..e95090f 100644
--- a/web/lib/gurl.php
+++ b/web/lib/gurl.php
@@ -1,18 +1,22 @@
 <?php
 
+function curlprogress($curli,$dlsz=0,$dled=0,$ulsz=0,$uled=0) {
+//	echo "DL: ${dled}; UL: ${uled}\n";
+}
+
 function gurl($url,$conntimeout=5,$functimeout=10,$headers=[]) {
 	$curli=curl_init();
-	// i 2 qui sotto servono a far sì che ctrl+c sia intercettato a monte
-	/*curl_setopt($curli,CURLOPT_NOPROGRESS,false);
-	curl_setopt($curli,CURLOPT_PROGRESSFUNCTION,function($curli,10,10,10,10){});*/
+/*	curl_setopt($curli,CURLOPT_NOPROGRESS,false);
+	curl_setopt($curli,CURLOPT_PROGRESSFUNCTION,'curlprogress');*/
 	curl_setopt($curli,CURLOPT_URL,$url);
 	curl_setopt($curli,CURLOPT_RETURNTRANSFER,true);
 	curl_setopt($curli,CURLOPT_FAILONERROR,true);
-	curl_setopt($curli,CURLOPT_CONNECTTIMEOUT,$conntimeout);
-	curl_setopt($curli,CURLOPT_TIMEOUT,$functimeout);
+	curl_setopt($curli,CURLOPT_CONNECTTIMEOUT,$conntimeout+0);
+	curl_setopt($curli,CURLOPT_TIMEOUT,$functimeout+0);
 	curl_setopt($curli,CURLOPT_HTTPHEADER,$headers);
 	curl_setopt($curli,CURLOPT_HEADER,true);
 	curl_setopt($curli,CURLOPT_ENCODING,'');
+	curl_setopt($curli,CURLOPT_USERAGENT,'Mozilla/5.0 (X11; Linux x86_64; rv:121.0) Gecko/20100101 Firefox/121.0');
 	$gheaders='';
 	$ecode=false;
 	$emsg=false;