mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Lukas Reschke 2016-03-09 15:13:07 +01:00
parent eff17fd3b7
commit bc4a043a76
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.htaccess
View File

@ -65,7 +65,6 @@
RewriteCond %{REQUEST_FILENAME} !/updater/ RewriteCond %{REQUEST_FILENAME} !/updater/
RewriteCond %{REQUEST_FILENAME} !/ocs-provider/ RewriteCond %{REQUEST_FILENAME} !/ocs-provider/
RewriteCond %{REQUEST_URI} !^/.well-known/acme-challenge/.* RewriteCond %{REQUEST_URI} !^/.well-known/acme-challenge/.*
RewriteRule .* index.php [PT,E=PATH_INFO:$1]
</IfModule> </IfModule>
<IfModule mod_mime.c> <IfModule mod_mime.c>
AddType image/svg+xml svg svgz AddType image/svg+xml svg svgz

5
lib/private/setup.php
View File

@ -422,8 +422,9 @@ class Setup {
// Add rewrite base // Add rewrite base
$webRoot = !empty(\OC::$WEBROOT) ? \OC::$WEBROOT : '/'; $webRoot = !empty(\OC::$WEBROOT) ? \OC::$WEBROOT : '/';
$content.="\n<IfModule mod_rewrite.c>"; $content .= "\n<IfModule mod_rewrite.c>";
$content.="\n RewriteBase ".$webRoot; $content .= "\n RewriteRule .* index.php [PT,E=PATH_INFO:$1]";
$content .= "\n RewriteBase ".$webRoot;
$content .= "\n <IfModule mod_env.c>"; $content .= "\n <IfModule mod_env.c>";
$content .= "\n SetEnv front_controller_active true"; $content .= "\n SetEnv front_controller_active true";
$content .= "\n <IfModule mod_dir.c>"; $content .= "\n <IfModule mod_dir.c>";