From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 6 Oct 2015 22:26:59 +0000 (-0700)
Subject: Restore "userAgent" MultiHttpClient constructor override
X-Git-Tag: 1.31.0-rc.0~9521^2
X-Git-Url: http://git.cyclocoop.org/%28%5B%5E/404?a=commitdiff_plain;h=ce16b7ccbfb8f86422b9027fa401ec8e8462db5b;p=lhc%2Fweb%2Fwiklou.git

Restore "userAgent" MultiHttpClient constructor override

This is more convenient than needing to set it on each
HTTP request. Also, it is still documented as being there.

Change-Id: I246c9c3861d72701c844200b82d1a38a0c301795
---

diff --git a/includes/libs/MultiHttpClient.php b/includes/libs/MultiHttpClient.php
index b6aeda5155..c6fa9148e7 100644
--- a/includes/libs/MultiHttpClient.php
+++ b/includes/libs/MultiHttpClient.php
@@ -55,6 +55,8 @@ class MultiHttpClient {
 	protected $maxConnsPerHost = 50;
 	/** @var string|null proxy */
 	protected $proxy;
+	/** @var string */
+	protected $userAgent = 'wikimedia/multi-http-client v1.0';
 
 	/**
 	 * @param array $options
@@ -345,7 +347,7 @@ class MultiHttpClient {
 		}
 
 		if ( !isset( $req['headers']['user-agent'] ) ) {
-			$req['headers']['user-agent'] = self::userAgent();
+			$req['headers']['user-agent'] = $this->userAgent;
 		}
 
 		$headers = array();
@@ -416,12 +418,4 @@ 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';
-	}
 }