diff options
| author | Sam Tuke <samtuke@owncloud.com> | 2013-02-06 13:59:21 +0000 |
|---|---|---|
| committer | Sam Tuke <samtuke@owncloud.com> | 2013-02-06 13:59:21 +0000 |
| commit | d2b288ca704af4d74d1fa13e44966b1c34cf56bd (patch) | |
| tree | e352fd2986f3ff3618b6f622d26989caeab5056d | |
| parent | 3b9e2f1babd578312377f846b2da4d30b550c37f (diff) | |
| download | nextcloud-server-d2b288ca704af4d74d1fa13e44966b1c34cf56bd.tar.gz nextcloud-server-d2b288ca704af4d74d1fa13e44966b1c34cf56bd.zip | |
Reverted erroneous commit
| -rwxr-xr-x | .htaccess | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/.htaccess b/.htaccess index 5a97bdc5990..048a56d6389 100755 --- a/.htaccess +++ b/.htaccess @@ -9,8 +9,8 @@ RequestHeader set XAuthorization %{XAUTHORIZATION}e env=XAUTHORIZATION ErrorDocument 403 /core/templates/403.php ErrorDocument 404 /core/templates/404.php <IfModule mod_php5.c> -php_value upload_max_filesize 512M -php_value post_max_size 512M +php_value upload_max_filesize 513M +php_value post_max_size 513M php_value memory_limit 512M <IfModule env_module> SetEnv htaccessWorking true @@ -20,8 +20,11 @@ php_value memory_limit 512M RewriteEngine on RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}] RewriteRule ^.well-known/host-meta /public.php?service=host-meta [QSA,L] +RewriteRule ^.well-known/host-meta.json /public.php?service=host-meta-json [QSA,L] RewriteRule ^.well-known/carddav /remote.php/carddav/ [R] -RewriteRule ^.well-known/caldav /remote.php/caldav/ [R] +RewriteRule ^.well-known/caldav /remote.php/caldav/ [R] +RewriteRule ^apps/calendar/caldav.php remote.php/caldav/ [QSA,L] +RewriteRule ^apps/contacts/carddav.php remote.php/carddav/ [QSA,L] RewriteRule ^apps/([^/]*)/(.*\.(css|php))$ index.php?app=$1&getfile=$2 [QSA,L] RewriteRule ^remote/(.*) remote.php [QSA,L] </IfModule> |