summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Appelman <icewind1991@gmail.com>2012-01-03 04:55:19 +0100
committerRobin Appelman <icewind1991@gmail.com>2012-01-03 04:55:57 +0100
commit4c8f17ad4747592cc01525c663de32962552cf18 (patch)
tree00b162c12683e99f81f946d6c44d50b6f47de55c
parentb8cffbc0eec099e0fb7ffbb53e7fc1dc5bbc4035 (diff)
downloadnextcloud-server-4c8f17ad4747592cc01525c663de32962552cf18.tar.gz
nextcloud-server-4c8f17ad4747592cc01525c663de32962552cf18.zip
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 :)
-rw-r--r--.htaccess2
-rw-r--r--lib/setup.php2
2 files changed, 3 insertions, 1 deletions
diff --git a/.htaccess b/.htaccess
index b181f8b8452..86a2de6b946 100644
--- 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 8afe0070e9b..b53c626c9a7 100644
--- 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";