summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2013-01-31 14:01:32 -0800
committerThomas Müller <thomas.mueller@tmit.eu>2013-01-31 14:01:32 -0800
commit317261d6dfa2b95234628c6e6649bcb94999552a (patch)
tree567e77c00d793ed56d6cc189e67df24bb089bcd9 /apps
parent206c6c1e1e09d2793b778200cbbe446260465f84 (diff)
parent7747f49263bb45674228318a81bb0f2bd214df34 (diff)
downloadnextcloud-server-317261d6dfa2b95234628c6e6649bcb94999552a.tar.gz
nextcloud-server-317261d6dfa2b95234628c6e6649bcb94999552a.zip
Merge pull request #1099 from herbrechtsmeier/ssl-proxy
add multiple domains reverse SSL proxy support
Diffstat (limited to 'apps')
-rw-r--r--apps/files/appinfo/remote.php2
-rw-r--r--apps/files/index.php2
2 files changed, 3 insertions, 1 deletions
diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php
index 6a78a1e0d75..6c92cc80b69 100644
--- a/apps/files/appinfo/remote.php
+++ b/apps/files/appinfo/remote.php
@@ -32,12 +32,14 @@ OC_Util::obEnd();
// Backends
$authBackend = new OC_Connector_Sabre_Auth();
$lockBackend = new OC_Connector_Sabre_Locks();
+$requestBackend = new OC_Connector_Sabre_Request();
// Create ownCloud Dir
$publicDir = new OC_Connector_Sabre_Directory('');
// Fire up server
$server = new Sabre_DAV_Server($publicDir);
+$server->httpRequest = $requestBackend;
$server->setBaseUri($baseuri);
// Load plugins
diff --git a/apps/files/index.php b/apps/files/index.php
index 7e767cc8a4f..104cf1a55d3 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -36,7 +36,7 @@ OCP\App::setActiveNavigationEntry('files_index');
$dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : '';
// Redirect if directory does not exist
if (!\OC\Files\Filesystem::is_dir($dir . '/')) {
- header('Location: ' . $_SERVER['SCRIPT_NAME'] . '');
+ header('Location: ' . OCP\Util::getScriptName() . '');
exit();
}