From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 7 Jan 2015 01:29:44 +0000 (+0000)
Subject: Merge "Make a VirtualRESTService class for Parsoid"
X-Git-Tag: 1.31.0-rc.0~12781
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=b5cf0db5627d6c0bd3483db5ed57e50dfee36227;p=lhc%2Fweb%2Fwiklou.git

Merge "Make a VirtualRESTService class for Parsoid"
---

b5cf0db5627d6c0bd3483db5ed57e50dfee36227
diff --cc includes/libs/MultiHttpClient.php
index eeda8d4cc0,8d9e8107c2..fb2daa6914
--- a/includes/libs/MultiHttpClient.php
+++ b/includes/libs/MultiHttpClient.php
@@@ -57,9 -60,9 +60,10 @@@ class MultiHttpClient 
  	 * @param array $options
  	 *   - connTimeout     : default connection timeout
  	 *   - reqTimeout      : default request timeout
+ 	 *   - proxy           : HTTP proxy to use
  	 *   - usePipelining   : whether to use HTTP pipelining if possible (for all hosts)
  	 *   - maxConnsPerHost : maximum number of concurrent connections (per host)
 +	 * @throws Exception
  	 */
  	public function __construct( array $options ) {
  		if ( isset( $options['caBundlePath'] ) ) {