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 :)

diff --git a/.htaccess b/.htaccess
index b181f8b8452aeea506c695a0be3d74e05ea682f6..86a2de6b946aeea280c0df7d060828baba17bf18 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -5,6 +5,8 @@ php_value post_max_size 512M
 php_value memory_limit 512M
 SetEnv htaccessWorking true
 </IfModule>
+<IfModule mod_rewrite.c>
 RewriteEngine on
 RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization},last]
+</IfModule>
 Options -Indexes

diff --git a/lib/setup.php b/lib/setup.php
index 8afe0070e9bdc7ed0f9bcd68a113ab94695dd5a1..b53c626c9a723fd6fa80470b5328990c307038cb 100644 (file)
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -275,7 +275,7 @@ class OC_Setup {
                $content.= "php_value post_max_size 512M\n";
                $content.= "SetEnv htaccessWorking true\n";
                $content.= "</IfModule>\n";
-               $content.= "<IfModule !mod_php5.c>\n";
+               $content.= "<IfModule mod_rewrite.c>";
                $content.= "RewriteEngine on\n";
                $content.= "RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization},last]\n";
                $content.= "</IfModule>\n";