summaryrefslogtreecommitdiffstats
path: root/lib/private/setup.php
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2016-03-09 15:13:07 +0100
committerLukas Reschke <lukas@owncloud.com>2016-03-09 15:13:07 +0100
commitbc4a043a7645efe207e3f1208ac3dea41b056384 (patch)
tree42d851abb5ad7405b9c5dab8691b7f5d1f71bd8e /lib/private/setup.php
parenteff17fd3b7021019e387e4f48a38ec450f622649 (diff)
downloadnextcloud-server-bc4a043a7645efe207e3f1208ac3dea41b056384.tar.gz
nextcloud-server-bc4a043a7645efe207e3f1208ac3dea41b056384.zip
Add base rewrite rule only when RewriteBase is defined
In case Apache is configured with an `Alias` such as with the ownCloud packages the rewrite rules will fail when no valid RewriteBase is configured.
Diffstat (limited to 'lib/private/setup.php')
-rw-r--r--lib/private/setup.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/private/setup.php b/lib/private/setup.php
index b9f8828227e..8a10a9cfbec 100644
--- a/lib/private/setup.php
+++ b/lib/private/setup.php
@@ -422,8 +422,9 @@ class Setup {
// Add rewrite base
$webRoot = !empty(\OC::$WEBROOT) ? \OC::$WEBROOT : '/';
- $content.="\n<IfModule mod_rewrite.c>";
- $content.="\n RewriteBase ".$webRoot;
+ $content .= "\n<IfModule mod_rewrite.c>";
+ $content .= "\n RewriteRule .* index.php [PT,E=PATH_INFO:$1]";
+ $content .= "\n RewriteBase ".$webRoot;
$content .= "\n <IfModule mod_env.c>";
$content .= "\n SetEnv front_controller_active true";
$content .= "\n <IfModule mod_dir.c>";