From: Timo Tijhof <krinklemail@gmail.com>
Date: Tue, 6 Oct 2015 19:45:03 +0000 (-0700)
Subject: MultiHttpClient: Don't use "MW" in User-Agent
X-Git-Tag: 1.31.0-rc.0~9527^2
X-Git-Url: https://git.cyclocoop.org/admin/?a=commitdiff_plain;h=1340a7717cbc1e52c2f8f699be70737c84290f81;p=lhc%2Fweb%2Fwiklou.git

MultiHttpClient: Don't use "MW" in User-Agent

Follows-up 6f51037d680ce.

Change-Id: I5e404c3a6ab9c3d1126676ee5fc22149422aa51f
---

diff --git a/includes/libs/MultiHttpClient.php b/includes/libs/MultiHttpClient.php
index 49966cf7bc..b6aeda5155 100644
--- a/includes/libs/MultiHttpClient.php
+++ b/includes/libs/MultiHttpClient.php
@@ -55,8 +55,6 @@ class MultiHttpClient {
 	protected $maxConnsPerHost = 50;
 	/** @var string|null proxy */
 	protected $proxy;
-	/** @var string */
-	protected $userAgent = 'MW-MultiHttpClient';
 
 	/**
 	 * @param array $options
@@ -347,7 +345,7 @@ class MultiHttpClient {
 		}
 
 		if ( !isset( $req['headers']['user-agent'] ) ) {
-			$req['headers']['user-agent'] = $this->userAgent;
+			$req['headers']['user-agent'] = self::userAgent();
 		}
 
 		$headers = array();
@@ -418,4 +416,12 @@ class MultiHttpClient {
 			curl_multi_close( $this->multiHandle );
 		}
 	}
+
+	/**
+	 * The default User-Agent for requests.
+	 * @return string
+	 */
+	public static function userAgent() {
+		return 'wikimedia/multi-http-client v1.0';
+	}
 }