Update to MediaWiki 1.26.0

5 files changed, 351 insertions, 145 deletions

diff --git a/includes/libs/virtualrest/ParsoidVirtualRESTService.php b/includes/libs/virtualrest/ParsoidVirtualRESTService.php
index 32a27f79..43dfab3c 100644
--- a/includes/libs/virtualrest/ParsoidVirtualRESTService.php
+++ b/includes/libs/virtualrest/ParsoidVirtualRESTService.php
@@ -24,21 +24,27 @@
  */
 class ParsoidVirtualRESTService extends VirtualRESTService {
 	/**
-	 * Example requests:
-	 *  GET /local/v1/page/$title/html/$oldid
-	 *   * $oldid is optional
-	 *  POST /local/v1/transform/html/to/wikitext/$title/$oldid
+	 * Example Parsoid v3 requests:
+	 *  GET /local/v3/page/html/$title/{$revision}
+	 *   * $revision is optional
+	 *  POST /local/v3/transform/html/to/wikitext/{$title}{/$revision}
 	 *   * body: array( 'html' => ... )
-	 *   * $title and $oldid are optional
-	 *  POST /local/v1/transform/wikitext/to/html/$title
-	 *   * body: array( 'wikitext' => ... ) or array( 'wikitext' => ..., 'body' => true/false )
+	 *   * $title and $revision are optional
+	 *  POST /local/v3/transform/wikitext/to/html/{$title}{/$revision}
+	 *   * body: array( 'wikitext' => ... ) or array( 'wikitext' => ..., 'bodyOnly' => true/false )
 	 *   * $title is optional
+	 *   * $revision is optional
+     *
+	 * There are also deprecated "v1" requests; see onParsoid1Request
+	 * for details.
 	 * @param array $params Key/value map
 	 *   - url            : Parsoid server URL
-	 *   - prefix         : Parsoid prefix for this wiki
+	 *   - domain         : Wiki domain to use
 	 *   - timeout        : Parsoid timeout (optional)
 	 *   - forwardCookies : Cookies to forward to Parsoid, or false. (optional)
 	 *   - HTTPProxy      : Parsoid HTTP proxy (optional)
+	 *   - restbaseCompat : whether to parse URL as if they were meant for RESTBase
+	 *                       boolean (optional)
 	 */
 	public function __construct( array $params ) {
 		// for backwards compatibility:
@@ -46,7 +52,30 @@ class ParsoidVirtualRESTService extends VirtualRESTService {
 			$params['url'] = $params['URL'];
 			unset( $params['URL'] );
 		}
-		parent::__construct( $params );
+		// set up defaults and merge them with the given params
+		$mparams = array_merge( array(
+			'name' => 'parsoid',
+			'url' => 'http://localhost:8000/',
+			'prefix' => 'localhost',
+			'domain' => 'localhost',
+			'forwardCookies' => false,
+			'HTTPProxy' => null,
+		), $params );
+		// Ensure that the url parameter has a trailing slash.
+		$mparams['url'] = preg_replace(
+			'#/?$#',
+			'/',
+			$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.
+		$mparams['domain'] = preg_replace(
+			'/^(https?:\/\/)?([^\/:]+?)(:\d+)?\/?$/',
+			'$2',
+			$mparams['domain']
+		);
+		parent::__construct( $mparams );
 	}
 
 	public function onRequests( array $reqs, Closure $idGeneratorFunc ) {
@@ -56,71 +85,143 @@ class ParsoidVirtualRESTService extends VirtualRESTService {
 
 			list(
 				$targetWiki, // 'local'
-				$version, // 'v1'
-				$reqType // 'page' or 'transform'
+				$version, // 'v3' ('v1' for restbase compatibility)
+				$reqType, // 'page' or 'transform'
+				$format, // 'html' or 'wikitext'
+				// $title (optional)
+				// $revision (optional)
 			) = $parts;
 
+			if ( isset( $this->params['restbaseCompat'] ) && $this->params['restbaseCompat'] ) {
+				if ( $version !== 'v1' ) {
+					throw new Exception( "Only RESTBase v1 API is supported." );
+				}
+				# Map RESTBase v1 API to Parsoid v3 API (pretty easy)
+				$req['url'] = preg_replace( '#^local/v1/#', 'local/v3/', $req['url'] );
+			} elseif ( $version !== 'v3' ) {
+				$result[$key] = $this->onParsoid1Request( $req, $idGeneratorFunc );
+				continue;
+			}
 			if ( $targetWiki !== 'local' ) {
+
 				throw new Exception( "Only 'local' target wiki is currently supported" );
-			} elseif ( $version !== 'v1' ) {
-				throw new Exception( "Only version 1 exists" );
-			} elseif ( $reqType !== 'page' && $reqType !== 'transform' ) {
-				throw new Exception( "Request type must be either 'page' or 'transform'" );
 			}
-
-			$req['url'] = $this->params['url'] . '/' . urlencode( $this->params['prefix'] ) . '/';
-
-			if ( $reqType === 'page' ) {
-				$title = $parts[3];
-				if ( $parts[4] !== 'html' ) {
-					throw new Exception( "Only 'html' output format is currently supported" );
-				}
-				if ( isset( $parts[5] ) ) {
-					$req['url'] .= $title . '?oldid=' . $parts[5];
-				} else {
-					$req['url'] .= $title;
-				}
-			} elseif ( $reqType === 'transform' ) {
-				if ( $parts[4] !== 'to' ) {
-					throw new Exception( "Part index 4 is not 'to'" );
-				}
-
-				if ( isset( $parts[6] ) ) {
-					$req['url'] .= $parts[6];
-				}
-
-				if ( $parts[3] === 'html' & $parts[5] === 'wikitext' ) {
-					if ( !isset( $req['body']['html'] ) ) {
-						throw new Exception( "You must set an 'html' body key for this request" );
-					}
-					if ( isset( $parts[7] ) ) {
-						$req['body']['oldid'] = $parts[7];
-					}
-				} elseif ( $parts[3] == 'wikitext' && $parts[5] == 'html' ) {
-					if ( !isset( $req['body']['wikitext'] ) ) {
-						throw new Exception( "You must set a 'wikitext' body key for this request" );
-					}
-					$req['body']['wt'] = $req['body']['wikitext'];
-					unset( $req['body']['wikitext'] );
-				} else {
-					throw new Exception( "Transformation unsupported" );
-				}
+			if ( $reqType !== 'page' && $reqType !== 'transform' ) {
+				throw new Exception( "Request action must be either 'page' or 'transform'" );
 			}
-
-			if ( isset( $this->params['HTTPProxy'] ) && $this->params['HTTPProxy'] ) {
+			if ( $format !== 'html' && $format !== 'wikitext' ) {
+				throw new Exception( "Request format must be either 'html' or 'wt'" );
+			}
+			// replace /local/ with the current domain
+			$req['url'] = preg_replace( '#^local/#', $this->params['domain'] . '/', $req['url'] );
+			// and prefix it with the service URL
+			$req['url'] = $this->params['url'] . $req['url'];
+			// set the appropriate proxy, timeout and headers
+			if ( $this->params['HTTPProxy'] ) {
 				$req['proxy'] = $this->params['HTTPProxy'];
 			}
-			if ( isset( $this->params['timeout'] ) ) {
+			if ( $this->params['timeout'] != null ) {
 				$req['reqTimeout'] = $this->params['timeout'];
 			}
-
-			// Forward cookies
-			if ( isset( $this->params['forwardCookies'] ) ) {
+			if ( $this->params['forwardCookies'] ) {
 				$req['headers']['Cookie'] = $this->params['forwardCookies'];
 			}
-
 			$result[$key] = $req;
 		}
 		return $result;
 	}
+
+	/**
+	 * Remap a Parsoid v1 request to a Parsoid v3 request.
+	 *
+	 * Example Parsoid v1 requests:
+	 *  GET /local/v1/page/$title/html/$oldid
+	 *   * $oldid is optional
+	 *  POST /local/v1/transform/html/to/wikitext/$title/$oldid
+	 *   * body: array( 'html' => ... )
+	 *   * $title and $oldid are optional
+	 *  POST /local/v1/transform/wikitext/to/html/$title
+	 *   * body: array( 'wikitext' => ... ) or array( 'wikitext' => ..., 'body' => true/false )
+	 *   * $title is optional
+	 *
+	 * NOTE: the POST APIs aren't "real" Parsoid v1 APIs, they are just what
+	 * Visual Editor "pretends" the V1 API is like.  A previous version of
+	 * ParsoidVirtualRESTService translated these to the "real" Parsoid v1
+	 * API.  We now translate these to the "real" Parsoid v3 API.
+	 */
+	public function onParsoid1Request( array $req, Closure $idGeneratorFunc ) {
+
+		$parts = explode( '/', $req['url'] );
+		list(
+			$targetWiki, // 'local'
+			$version, // 'v1'
+			$reqType // 'page' or 'transform'
+		) = $parts;
+		if ( $targetWiki !== 'local' ) {
+			throw new Exception( "Only 'local' target wiki is currently supported" );
+		} elseif ( $version !== 'v1' ) {
+			throw new Exception( "Only v1 and v3 are supported." );
+		} elseif ( $reqType !== 'page' && $reqType !== 'transform' ) {
+			throw new Exception( "Request type must be either 'page' or 'transform'" );
+		}
+		$req['url'] = $this->params['url'] . $this->params['domain'] . '/v3/';
+		if ( $reqType === 'page' ) {
+			$title = $parts[3];
+			if ( $parts[4] !== 'html' ) {
+				throw new Exception( "Only 'html' output format is currently supported" );
+			}
+			$req['url'] .= 'page/html/' . $title;
+			if ( isset( $parts[5] ) ) {
+				$req['url'] .= '/' . $parts[5];
+			} elseif ( isset( $req['query']['oldid'] ) && $req['query']['oldid'] ) {
+				$req['url'] .= '/' . $req['query']['oldid'];
+				unset( $req['query']['oldid'] );
+			}
+		} elseif ( $reqType === 'transform' ) {
+			$req['url'] .= 'transform/'. $parts[3] . '/to/' . $parts[5];
+			// the title
+			if ( isset( $parts[6] ) ) {
+				$req['url'] .= '/' . $parts[6];
+			}
+			// revision id
+			if ( isset( $parts[7] ) ) {
+				$req['url'] .= '/' . $parts[7];
+			} elseif ( isset( $req['body']['oldid'] ) && $req['body']['oldid'] ) {
+				$req['url'] .= '/' . $req['body']['oldid'];
+				unset( $req['body']['oldid'] );
+			}
+			if ( $parts[4] !== 'to' ) {
+				throw new Exception( "Part index 4 is not 'to'" );
+			}
+			if ( $parts[3] === 'html' && $parts[5] === 'wikitext' ) {
+				if ( !isset( $req['body']['html'] ) ) {
+					throw new Exception( "You must set an 'html' body key for this request" );
+				}
+			} elseif ( $parts[3] == 'wikitext' && $parts[5] == 'html' ) {
+				if ( !isset( $req['body']['wikitext'] ) ) {
+					throw new Exception( "You must set a 'wikitext' body key for this request" );
+				}
+				if ( isset( $req['body']['body'] ) ) {
+					$req['body']['bodyOnly'] = $req['body']['body'];
+					unset( $req['body']['body'] );
+				}
+			} else {
+				throw new Exception( "Transformation unsupported" );
+			}
+		}
+		// set the appropriate proxy, timeout and headers
+		if ( $this->params['HTTPProxy'] ) {
+			$req['proxy'] = $this->params['HTTPProxy'];
+		}
+		if ( $this->params['timeout'] != null ) {
+			$req['reqTimeout'] = $this->params['timeout'];
+		}
+		if ( $this->params['forwardCookies'] ) {
+			$req['headers']['Cookie'] = $this->params['forwardCookies'];
+		}
+
+		return $req;
+
+	}
+
 }
diff --git a/includes/libs/virtualrest/RestbaseVirtualRESTService.php b/includes/libs/virtualrest/RestbaseVirtualRESTService.php
index 8fe5b921..3a7bc587 100644
--- a/includes/libs/virtualrest/RestbaseVirtualRESTService.php
+++ b/includes/libs/virtualrest/RestbaseVirtualRESTService.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Virtual HTTP service client for Restbase
+ * Virtual HTTP service client for RESTBase
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,23 +19,23 @@
  */
 
 /**
- * Virtual REST service for Restbase
+ * Virtual REST service for RESTBase
  * @since 1.25
  */
 class RestbaseVirtualRESTService extends VirtualRESTService {
 	/**
-	 * Example requests:
-	 *  GET /local/v1/page/{title}/html{/revision}
+	 * Example RESTBase v1 requests:
+	 *  GET /local/v1/page/html/{title}{/revision}
 	 *  POST /local/v1/transform/html/to/wikitext{/title}{/revision}
 	 *   * body: array( 'html' => ... )
 	 *  POST /local/v1/transform/wikitext/to/html{/title}{/revision}
 	 *   * body: array( 'wikitext' => ... ) or array( 'wikitext' => ..., 'bodyOnly' => true/false )
 	 *
 	 * @param array $params Key/value map
-	 *   - url            : Restbase server URL
+	 *   - url            : RESTBase server URL
 	 *   - domain         : Wiki domain to use
 	 *   - timeout        : request timeout in seconds (optional)
-	 *   - forwardCookies : cookies to forward to Restbase/Parsoid (as a Cookie
+	 *   - forwardCookies : cookies to forward to RESTBase/Parsoid (as a Cookie
 	 *                       header string) or false (optional)
 	 *                       Note: forwardCookies will in the future be a boolean
 	 *                       only, signifing request cookies should be forwarded
@@ -48,18 +48,27 @@ class RestbaseVirtualRESTService extends VirtualRESTService {
 	public function __construct( array $params ) {
 		// set up defaults and merge them with the given params
 		$mparams = array_merge( array(
-			'url' => 'http://localhost:7231',
+			'name' => 'restbase',
+			'url' => 'http://localhost:7231/',
 			'domain' => 'localhost',
 			'timeout' => 100,
 			'forwardCookies' => false,
 			'HTTPProxy' => null,
 			'parsoidCompat' => false
 		), $params );
-		// ensure the correct domain format
+		// Ensure that the url parameter has a trailing slash.
+		$mparams['url'] = preg_replace(
+			'#/?$#',
+			'/',
+			$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.
 		$mparams['domain'] = preg_replace(
-				'/^(https?:\/\/)?([^\/:]+?)(\/|:\d+\/?)?$/',
-				'$2',
-				$mparams['domain']
+			'/^(https?:\/\/)?([^\/:]+?)(:\d+)?\/?$/',
+			'$2',
+			$mparams['domain']
 		);
 		parent::__construct( $mparams );
 	}
@@ -73,7 +82,7 @@ class RestbaseVirtualRESTService extends VirtualRESTService {
 		$result = array();
 		foreach ( $reqs as $key => $req ) {
 			// replace /local/ with the current domain
-			$req['url'] = preg_replace( '/^\/local\//', '/' . $this->params['domain'] . '/', $req['url'] );
+			$req['url'] = preg_replace( '#^local/#', $this->params['domain'] . '/', $req['url'] );
 			// and prefix it with the service URL
 			$req['url'] = $this->params['url'] . $req['url'];
 			// set the appropriate proxy, timeout and headers
@@ -94,83 +103,164 @@ class RestbaseVirtualRESTService extends VirtualRESTService {
 	}
 
 	/**
-	 * Remaps Parsoid requests to Restbase paths
+	 * Remaps Parsoid v1/v3 requests to RESTBase v1 requests.
 	 */
 	public function onParsoidRequests( array $reqs, Closure $idGeneratorFunc ) {
 
 		$result = array();
 		foreach ( $reqs as $key => $req ) {
 			$parts = explode( '/', $req['url'] );
-			list(
-				$targetWiki, // 'local'
-				$version, // 'v1'
-				$reqType // 'page' or 'transform'
-			) = $parts;
-			if ( $targetWiki !== 'local' ) {
-				throw new Exception( "Only 'local' target wiki is currently supported" );
-			} elseif ( $reqType !== 'page' && $reqType !== 'transform' ) {
-				throw new Exception( "Request type must be either 'page' or 'transform'" );
+			if ( $parts[1] === 'v3' ) {
+				$result[$key] = $this->onParsoid3Request( $req, $idGeneratorFunc );
+			} elseif ( $parts[1] === 'v1' ) {
+				$result[$key] = $this->onParsoid1Request( $req, $idGeneratorFunc );
+			} else {
+				throw new Exception( "Only v1 and v3 are supported." );
 			}
-			$req['url'] = $this->params['url'] . '/' . $this->params['domain'] . '/v1/' . $reqType . '/';
-			if ( $reqType === 'page' ) {
-				$title = $parts[3];
-				if ( $parts[4] !== 'html' ) {
-					throw new Exception( "Only 'html' output format is currently supported" );
-				}
-				$req['url'] .= 'html/' . $title;
-				if ( isset( $parts[5] ) ) {
-					$req['url'] .= '/' . $parts[5];
-				} elseif ( isset( $req['query']['oldid'] ) && $req['query']['oldid'] ) {
-					$req['url'] .= '/' . $req['query']['oldid'];
-					unset( $req['query']['oldid'] );
-				}
-			} elseif ( $reqType === 'transform' ) {
-				// from / to transform
-				$req['url'] .= $parts[3] . '/to/' . $parts[5];
-				// the title
-				if ( isset( $parts[6] ) ) {
-					$req['url'] .= '/' . $parts[6];
-				}
-				// revision id
-				if ( isset( $parts[7] ) ) {
-					$req['url'] .= '/' . $parts[7];
-				} elseif ( isset( $req['body']['oldid'] ) && $req['body']['oldid'] ) {
-					$req['url'] .= '/' . $req['body']['oldid'];
-					unset( $req['body']['oldid'] );
-				}
-				if ( $parts[4] !== 'to' ) {
-					throw new Exception( "Part index 4 is not 'to'" );
-				}
-				if ( $parts[3] === 'html' & $parts[5] === 'wikitext' ) {
-					if ( !isset( $req['body']['html'] ) ) {
-						throw new Exception( "You must set an 'html' body key for this request" );
-					}
-				} elseif ( $parts[3] == 'wikitext' && $parts[5] == 'html' ) {
-					if ( !isset( $req['body']['wikitext'] ) ) {
-						throw new Exception( "You must set a 'wikitext' body key for this request" );
-					}
-					if ( isset( $req['body']['body'] ) ) {
-						$req['body']['bodyOnly'] = $req['body']['body'];
-						unset( $req['body']['body'] );
-					}
-				} else {
-					throw new Exception( "Transformation unsupported" );
-				}
+		}
+
+		return $result;
+
+	}
+
+	/**
+	 * Remap a Parsoid v1 request to a RESTBase v1 request.
+	 *
+	 * Example Parsoid v1 requests:
+	 *  GET /local/v1/page/$title/html/$oldid
+	 *   * $oldid is optional
+	 *  POST /local/v1/transform/html/to/wikitext/$title/$oldid
+	 *   * body: array( 'html' => ... )
+	 *   * $title and $oldid are optional
+	 *  POST /local/v1/transform/wikitext/to/html/$title
+	 *   * body: array( 'wikitext' => ... ) or array( 'wikitext' => ..., 'body' => true/false )
+	 *   * $title is optional
+	 *
+	 * NOTE: the POST APIs aren't "real" Parsoid v1 APIs, they are just what
+	 * Visual Editor "pretends" the V1 API is like.  (See
+	 * ParsoidVirtualRESTService.)
+	 */
+	public function onParsoid1Request( array $req, Closure $idGeneratorFunc ) {
+		$parts = explode( '/', $req['url'] );
+		list(
+			$targetWiki, // 'local'
+			$version, // 'v1'
+			$reqType // 'page' or 'transform'
+		) = $parts;
+		if ( $targetWiki !== 'local' ) {
+			throw new Exception( "Only 'local' target wiki is currently supported" );
+		} elseif ( $version !== 'v1' ) {
+			throw new Exception( "Version mismatch: should not happen." );
+		} elseif ( $reqType !== 'page' && $reqType !== 'transform' ) {
+			throw new Exception( "Request type must be either 'page' or 'transform'" );
+		}
+		$req['url'] = $this->params['url'] . $this->params['domain'] . '/v1/' . $reqType . '/';
+		if ( $reqType === 'page' ) {
+			$title = $parts[3];
+			if ( $parts[4] !== 'html' ) {
+				throw new Exception( "Only 'html' output format is currently supported" );
 			}
-			// set the appropriate proxy, timeout and headers
-			if ( $this->params['HTTPProxy'] ) {
-				$req['proxy'] = $this->params['HTTPProxy'];
+			$req['url'] .= 'html/' . $title;
+			if ( isset( $parts[5] ) ) {
+				$req['url'] .= '/' . $parts[5];
+			} elseif ( isset( $req['query']['oldid'] ) && $req['query']['oldid'] ) {
+				$req['url'] .= '/' . $req['query']['oldid'];
+				unset( $req['query']['oldid'] );
 			}
-			if ( $this->params['timeout'] != null ) {
-				$req['reqTimeout'] = $this->params['timeout'];
+		} elseif ( $reqType === 'transform' ) {
+			// from / to transform
+			$req['url'] .= $parts[3] . '/to/' . $parts[5];
+			// the title
+			if ( isset( $parts[6] ) ) {
+				$req['url'] .= '/' . $parts[6];
 			}
-			if ( $this->params['forwardCookies'] ) {
-				$req['headers']['Cookie'] = $this->params['forwardCookies'];
+			// revision id
+			if ( isset( $parts[7] ) ) {
+				$req['url'] .= '/' . $parts[7];
+			} elseif ( isset( $req['body']['oldid'] ) && $req['body']['oldid'] ) {
+				$req['url'] .= '/' . $req['body']['oldid'];
+				unset( $req['body']['oldid'] );
+			}
+			if ( $parts[4] !== 'to' ) {
+				throw new Exception( "Part index 4 is not 'to'" );
+			}
+			if ( $parts[3] === 'html' && $parts[5] === 'wikitext' ) {
+				if ( !isset( $req['body']['html'] ) ) {
+					throw new Exception( "You must set an 'html' body key for this request" );
+				}
+			} elseif ( $parts[3] == 'wikitext' && $parts[5] == 'html' ) {
+				if ( !isset( $req['body']['wikitext'] ) ) {
+					throw new Exception( "You must set a 'wikitext' body key for this request" );
+				}
+				if ( isset( $req['body']['body'] ) ) {
+					$req['body']['bodyOnly'] = $req['body']['body'];
+					unset( $req['body']['body'] );
+				}
+			} else {
+				throw new Exception( "Transformation unsupported" );
 			}
-			$result[$key] = $req;
+		}
+		// set the appropriate proxy, timeout and headers
+		if ( $this->params['HTTPProxy'] ) {
+			$req['proxy'] = $this->params['HTTPProxy'];
+		}
+		if ( $this->params['timeout'] != null ) {
+			$req['reqTimeout'] = $this->params['timeout'];
+		}
+		if ( $this->params['forwardCookies'] ) {
+			$req['headers']['Cookie'] = $this->params['forwardCookies'];
 		}
 
-		return $result;
+		return $req;
+
+	}
+
+	/**
+	 * Remap a Parsoid v3 request to a RESTBase v1 request.
+	 *
+	 * Example Parsoid v3 requests:
+	 *  GET /local/v3/page/html/$title/{$revision}
+	 *   * $revision is optional
+	 *  POST /local/v3/transform/html/to/wikitext/{$title}{/$revision}
+	 *   * body: array( 'html' => ... )
+	 *   * $title and $revision are optional
+	 *  POST /local/v3/transform/wikitext/to/html/{$title}{/$revision}
+	 *   * body: array( 'wikitext' => ... ) or array( 'wikitext' => ..., 'bodyOnly' => true/false )
+	 *   * $title is optional
+	 *   * $revision is optional
+	 */
+	public function onParsoid3Request( array $req, Closure $idGeneratorFunc ) {
+
+		$parts = explode( '/', $req['url'] );
+		list(
+			$targetWiki, // 'local'
+			$version, // 'v3'
+			$action, // 'transform' or 'page'
+			$format, // 'html' or 'wikitext'
+			// $title, // optional
+			// $revision, // optional
+		) = $parts;
+		if ( $targetWiki !== 'local' ) {
+			throw new Exception( "Only 'local' target wiki is currently supported" );
+		} elseif ( $version !== 'v3' ) {
+			throw new Exception( "Version mismatch: should not happen." );
+		}
+		// replace /local/ with the current domain, change v3 to v1,
+		$req['url'] = preg_replace( '#^local/v3/#', $this->params['domain'] . '/v1/', $req['url'] );
+		// and prefix it with the service URL
+		$req['url'] = $this->params['url'] . $req['url'];
+		// set the appropriate proxy, timeout and headers
+		if ( $this->params['HTTPProxy'] ) {
+			$req['proxy'] = $this->params['HTTPProxy'];
+		}
+		if ( $this->params['timeout'] != null ) {
+			$req['reqTimeout'] = $this->params['timeout'];
+		}
+		if ( $this->params['forwardCookies'] ) {
+			$req['headers']['Cookie'] = $this->params['forwardCookies'];
+		}
+
+		return $req;
 
 	}
 
diff --git a/includes/libs/virtualrest/SwiftVirtualRESTService.php b/includes/libs/virtualrest/SwiftVirtualRESTService.php
index 011dabe0..88b0e1f1 100644
--- a/includes/libs/virtualrest/SwiftVirtualRESTService.php
+++ b/includes/libs/virtualrest/SwiftVirtualRESTService.php
@@ -45,7 +45,11 @@ class SwiftVirtualRESTService extends VirtualRESTService {
 	 *   - swiftAuthTTL       : Swift authentication TTL (seconds)
 	 */
 	public function __construct( array $params ) {
-		parent::__construct( $params );
+		// set up defaults and merge them with the given params
+		$mparams = array_merge( array(
+			'name' => 'swift'
+		), $params );
+		parent::__construct( $mparams );
 	}
 
 	/**
diff --git a/includes/libs/virtualrest/VirtualRESTService.php b/includes/libs/virtualrest/VirtualRESTService.php
index 05c2afc1..01a4ea6e 100644
--- a/includes/libs/virtualrest/VirtualRESTService.php
+++ b/includes/libs/virtualrest/VirtualRESTService.php
@@ -45,6 +45,17 @@ abstract class VirtualRESTService {
 	}
 
 	/**
+	 * Return the name of this service, in a form suitable for error
+	 * reporting or debugging.
+	 *
+	 * @return string The name of the service behind this VRS object.
+	 */
+	public function getName() {
+		return isset( $this->params['name'] ) ? $this->params['name'] :
+			get_class( $this );
+	}
+
+	/**
 	 * Prepare virtual HTTP(S) requests (for this service) for execution
 	 *
 	 * This method should mangle any of the $reqs entry fields as needed:
@@ -84,8 +95,8 @@ abstract class VirtualRESTService {
 	 *
 	 * This method may mangle any of the $reqs entry 'response' fields as needed:
 	 *   - code    : perform any code normalization [as needed]
- 	 *   - reason  : perform any reason normalization [as needed]
- 	 *   - headers : perform any header normalization [as needed]
+	 *   - reason  : perform any reason normalization [as needed]
+	 *   - headers : perform any header normalization [as needed]
 	 *
 	 * This method can also remove some of the requests as well as add new ones
 	 * (using $idGenerator to set each of the entries' array keys). For any existing
diff --git a/includes/libs/virtualrest/VirtualRESTServiceClient.php b/includes/libs/virtualrest/VirtualRESTServiceClient.php
index e8bb38d8..519da431 100644
--- a/includes/libs/virtualrest/VirtualRESTServiceClient.php
+++ b/includes/libs/virtualrest/VirtualRESTServiceClient.php
@@ -127,9 +127,9 @@ class VirtualRESTServiceClient {
 	 *   - body    : HTTP response body or resource (if "stream" was set)
 	 *   - error   : Any cURL error string
 	 * The map also stores integer-indexed copies of these values. This lets callers do:
-	 *	<code>
-	 *		list( $rcode, $rdesc, $rhdrs, $rbody, $rerr ) = $client->run( $req );
-	 *  </code>
+	 * @code
+	 *     list( $rcode, $rdesc, $rhdrs, $rbody, $rerr ) = $client->run( $req );
+	 * @endcode
 	 * @param array $req Virtual HTTP request maps
 	 * @return array Response array for request
 	 */
@@ -148,9 +148,9 @@ class VirtualRESTServiceClient {
 	 *   - body    : HTTP response body or resource (if "stream" was set)
 	 *   - error   : Any cURL error string
 	 * The map also stores integer-indexed copies of these values. This lets callers do:
-	 *    <code>
-	 *        list( $rcode, $rdesc, $rhdrs, $rbody, $rerr ) = $responses[0];
-	 *  </code>
+	 * @code
+	 *     list( $rcode, $rdesc, $rhdrs, $rbody, $rerr ) = $responses[0];
+	 * @endcode
 	 *
 	 * @param array $reqs Map of Virtual HTTP request maps
 	 * @return array $reqs Map of corresponding response values with the same keys/order