don't try to use mod_rewrite when it isn't enabled

having a broken web/card/caldav is much better as having no ownCloud at all :)
This commit is contained in:
Robin Appelman 2012-01-03 04:55:19 +01:00
parent b8cffbc0ee
commit 4c8f17ad47
2 changed files with 3 additions and 1 deletions

View File

@ -5,6 +5,8 @@ php_value post_max_size 512M
php_value memory_limit 512M php_value memory_limit 512M
SetEnv htaccessWorking true SetEnv htaccessWorking true
</IfModule> </IfModule>
<IfModule mod_rewrite.c>
RewriteEngine on RewriteEngine on
RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization},last] RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization},last]
</IfModule>
Options -Indexes Options -Indexes

View File

@ -275,7 +275,7 @@ class OC_Setup {
$content.= "php_value post_max_size 512M\n"; $content.= "php_value post_max_size 512M\n";
$content.= "SetEnv htaccessWorking true\n"; $content.= "SetEnv htaccessWorking true\n";
$content.= "</IfModule>\n"; $content.= "</IfModule>\n";
$content.= "<IfModule !mod_php5.c>\n"; $content.= "<IfModule mod_rewrite.c>";
$content.= "RewriteEngine on\n"; $content.= "RewriteEngine on\n";
$content.= "RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization},last]\n"; $content.= "RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization},last]\n";
$content.= "</IfModule>\n"; $content.= "</IfModule>\n";