jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/373989 )
Change subject: Fix RestbaseVirtualRESTService URL standardization
......................................................................
Fix RestbaseVirtualRESTService URL standardization
The regex /?$ will add a second slash to URLs which already end
in a slash (since it will match both the trailing slash and the
empty position after it), which is enough to trip up HyperSwitch.
Change-Id: I675f8252a2496ace4d6c364a869776dff604df59
---
M includes/libs/virtualrest/RestbaseVirtualRESTService.php
1 file changed, 3 insertions(+), 5 deletions(-)
Approvals:
Mobrovac: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/libs/virtualrest/RestbaseVirtualRESTService.php
b/includes/libs/virtualrest/RestbaseVirtualRESTService.php
index 35c45de..90865ff 100644
--- a/includes/libs/virtualrest/RestbaseVirtualRESTService.php
+++ b/includes/libs/virtualrest/RestbaseVirtualRESTService.php
@@ -61,11 +61,9 @@
'fixedUrl' => false,
], $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.
--
To view, visit https://gerrit.wikimedia.org/r/373989
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I675f8252a2496ace4d6c364a869776dff604df59
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza <[email protected]>
Gerrit-Reviewer: C. Scott Ananian <[email protected]>
Gerrit-Reviewer: Mobrovac <[email protected]>
Gerrit-Reviewer: Ppchelko <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
