From 06032ec11e671f3e2c68a0d66b2348c828b9098e Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Sun, 1 Sep 2019 09:57:51 -0700 Subject: [PATCH] Remove unused variable in MultiHttpClient CURLOPT_READFUNCTION callback Also make sure the result is a string as is required Change-Id: I90107efd8f253aebc9b83fc2272aedf65ba161ba --- includes/libs/http/MultiHttpClient.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/includes/libs/http/MultiHttpClient.php b/includes/libs/http/MultiHttpClient.php index 6b1ef89f46..17352f03b9 100644 --- a/includes/libs/http/MultiHttpClient.php +++ b/includes/libs/http/MultiHttpClient.php @@ -353,9 +353,7 @@ class MultiHttpClient implements LoggerAwareInterface { } curl_setopt( $ch, CURLOPT_READFUNCTION, function ( $ch, $fd, $length ) { - $data = fread( $fd, $length ); - $len = strlen( $data ); - return $data; + return (string)fread( $fd, $length ); } ); } elseif ( $req['method'] === 'POST' ) { -- 2.20.1