From f75da376ff31eed20e409797260ba832be3b9308 Mon Sep 17 00:00:00 2001
From: Nathan Gass
Date: Mon, 30 Oct 2023 17:47:27 +0100
Subject: simplify maxlength implementation and make compatible with
 writefunction

---
 it_url.class | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/it_url.class b/it_url.class
index facf78d..e79d894 100644
--- a/it_url.class
+++ b/it_url.class
@@ -306,18 +306,12 @@ function request($p=array())
 
 
 	// FIXME 2025-01 NG just use CURLOPT_MAXFILESIZE if we have curl 8.4
-	if ($p['maxlength'] && !$p['writefunction'])
+	if ($p['maxlength'])
 	{
-		$content = "";
-		$opts[CURLOPT_WRITEFUNCTION] = function ($dummy, $data) use ($p, &$content) {
-			static $total = 0;
-			$size = strlen($data);
-			$total += $size;
-			if ($total > $p['maxlength'])
-				return 0;
-			$content .= $data;
-			return $size;
+		$opts[CURLOPT_XFERINFOFUNCTION] = function ($dummy, $dummy2, $total) use ($p) {
+			return $total < $p['maxlength'] ? 0 : 1;
 		};
+		$opts[CURLOPT_NOPROGRESS] = 0;
 	}
 
 	$opts[CURLOPT_HEADERFUNCTION] = function ($dummy, $data) use (&$header) {
@@ -329,9 +323,6 @@ function request($p=array())
 
 	$got = curl_exec($curl);
 
-	if ($p['maxlength'] && $got)
-		$got = $content;
-
 	$this->curlinfo = curl_getinfo($curl);
 	EDC('curlinfo', $this->curlinfo);
 
-- 
cgit v1.2.3