diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php index 2143b7a4107..ed59979f735 100644 --- a/includes/ServiceWiring.php +++ b/includes/ServiceWiring.php @@ -1231,7 +1231,8 @@ return [ function ( MediaWikiServices $services ) : VirtualRESTServiceClient { $config = $services->getMainConfig()->get( 'VirtualRestConfig' ); - $vrsClient = new VirtualRESTServiceClient( new MultiHttpClient( [] ) ); + $vrsClient = new VirtualRESTServiceClient( + $services->getHttpRequestFactory()->createMultiClient() ); foreach ( $config['paths'] as $prefix => $serviceConfig ) { $class = $serviceConfig['class']; // Merge in the global defaults diff --git a/includes/deferred/CdnCacheUpdate.php b/includes/deferred/CdnCacheUpdate.php index 0c457883049..843002792a4 100644 --- a/includes/deferred/CdnCacheUpdate.php +++ b/includes/deferred/CdnCacheUpdate.php @@ -315,7 +315,8 @@ class CdnCacheUpdate implements DeferrableUpdate, MergeableUpdate { } } - $http = new MultiHttpClient( [ 'maxConnsPerHost' => 8, 'usePipelining' => true ] ); + $http = MediaWikiServices::getInstance()->getHttpRequestFactory() + ->createMultiClient( [ 'maxConnsPerHost' => 8, 'usePipelining' => true ] ); $http->runMulti( $reqs ); } diff --git a/includes/http/Http.php b/includes/http/Http.php index 9596169b457..a9415e7be35 100644 --- a/includes/http/Http.php +++ b/includes/http/Http.php @@ -18,7 +18,6 @@ * @file */ -use MediaWiki\Logger\LoggerFactory; use MediaWiki\MediaWikiServices; /** @@ -135,21 +134,14 @@ class Http { /** * Get a configured MultiHttpClient * - * @deprecated since 1.34, construct it directly + * @deprecated since 1.34, use MediaWikiServices::getHttpRequestFactory()->createMultiClient() * @param array $options * @return MultiHttpClient */ public static function createMultiClient( array $options = [] ) { wfDeprecated( __METHOD__, '1.34' ); - - global $wgHTTPConnectTimeout, $wgHTTPTimeout, $wgHTTPProxy; - - return new MultiHttpClient( $options + [ - 'connTimeout' => $wgHTTPConnectTimeout, - 'reqTimeout' => $wgHTTPTimeout, - 'userAgent' => self::userAgent(), - 'proxy' => $wgHTTPProxy, - 'logger' => LoggerFactory::getInstance( 'http' ) - ] ); + global $wgHTTPProxy; + return MediaWikiServices::getInstance()->getHttpRequestFactory() + ->createMultiClient( $options + [ 'proxy' => $wgHTTPProxy ] ); } }