summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2015-01-26 17:17:04 +0100
committerVincent Petry <pvince81@owncloud.com>2015-01-26 17:17:04 +0100
commit44d69d71780d94ab89f81e54ebf9ec23a5b04316 (patch)
tree856e4f4951c6be94576d7033ad80ebc440634b0d
parent836b80919feb3e32ab54d605385c32a5da053cdc (diff)
parentd5b61f9afe7edef452fcaebd4192957bb289d699 (diff)
downloadnextcloud-server-44d69d71780d94ab89f81e54ebf9ec23a5b04316.tar.gz
nextcloud-server-44d69d71780d94ab89f81e54ebf9ec23a5b04316.zip
Merge pull request #13677 from owncloud/s2s-doubleslashrequest
Prevent double slash in shareinfo request URL
-rw-r--r--apps/files_sharing/lib/external/storage.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_sharing/lib/external/storage.php b/apps/files_sharing/lib/external/storage.php
index 0d41176e45a..b3978af6852 100644
--- a/apps/files_sharing/lib/external/storage.php
+++ b/apps/files_sharing/lib/external/storage.php
@@ -194,7 +194,7 @@ class Storage extends DAV implements ISharedStorage {
$remote = $this->getRemote();
$token = $this->getToken();
$password = $this->getPassword();
- $url = $remote . '/index.php/apps/files_sharing/shareinfo?t=' . $token;
+ $url = rtrim($remote, '/') . '/index.php/apps/files_sharing/shareinfo?t=' . $token;
$ch = curl_init();