From: Gergő Tisza <gtisza@wikimedia.org>
Date: Thu, 7 Sep 2017 03:13:17 +0000 (+0000)
Subject: Minor fixes to ParsoidVirtualRESTService
X-Git-Tag: 1.31.0-rc.0~2164^2
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=6bdfe84095e534057fe112e275e9bf703c326cab;p=lhc%2Fweb%2Fwiklou.git

Minor fixes to ParsoidVirtualRESTService

* fix URL standardization (follow-up to I675f8252a2)
* avoid warning when timeout is not provided

Change-Id: I2a6c099f52f78017f92de4c078e79de04f230dda
---

diff --git a/includes/libs/virtualrest/ParsoidVirtualRESTService.php b/includes/libs/virtualrest/ParsoidVirtualRESTService.php
index a148a39707..b03a64783f 100644
--- a/includes/libs/virtualrest/ParsoidVirtualRESTService.php
+++ b/includes/libs/virtualrest/ParsoidVirtualRESTService.php
@@ -58,15 +58,14 @@ class ParsoidVirtualRESTService extends VirtualRESTService {
 			'url' => 'http://localhost:8000/',
 			'prefix' => 'localhost',
 			'domain' => 'localhost',
+			'timeout' => null,
 			'forwardCookies' => false,
 			'HTTPProxy' => null,
 		], $params );
 		// Ensure that the url parameter has a trailing slash.
-		$mparams['url'] = preg_replace(
-			'#/?$#',
-			'/',
-			$mparams['url']
-		);
+		if ( substr( $mparams['url'], -1 ) !== '/' ) {
+			$mparams['url'] .= '/';
+		}
 		// Ensure the correct domain format: strip protocol, port,
 		// and trailing slash if present.  This lets us use
 		// $wgCanonicalServer as a default value, which is very convenient.