Merge pull request #3629 from Ayesh/php84-curl-depr

nao-pon · web-flow · commit 66f497515ab2 · 2024-01-17T10:23:46.000+09:00
[PHP 8.4] Fix: Curl `CURLOPT_BINARYTRANSFER` deprecated
diff --git a/php/elFinder.class.php b/php/elFinder.class.php
@@ -2706,7 +2706,6 @@ protected function curl_get_contents(&$url, $timeout, $redirect_max, $ua, $outfp
             curl_setopt($ch, CURLOPT_FILE, $outfp);
         } else {
             curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-            curl_setopt($ch, CURLOPT_BINARYTRANSFER, true);
         }
         curl_setopt($ch, CURLOPT_LOW_SPEED_LIMIT, 1);
         curl_setopt($ch, CURLOPT_LOW_SPEED_TIME, $timeout);

Original file line number	Diff line number	Diff line change
`@@ -2706,7 +2706,6 @@ protected function curl_get_contents(&$url, $timeout, $redirect_max, $ua, $outfp`
`2706`	`2706`	`curl_setopt($ch, CURLOPT_FILE, $outfp);`
`2707`	`2707`	`} else {`
`2708`	`2708`	`curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);`
`2709`		`- curl_setopt($ch, CURLOPT_BINARYTRANSFER, true);`
`2710`	`2709`	`}`
`2711`	`2710`	`curl_setopt($ch, CURLOPT_LOW_SPEED_LIMIT, 1);`
`2712`	`2711`	`curl_setopt($ch, CURLOPT_LOW_SPEED_TIME, $timeout);`