From 460d06c23561a551df357c8f5158a5bbe31c3649 Mon Sep 17 00:00:00 2001 From: Felix Eckhofer Date: Thu, 24 Apr 2014 15:29:36 +0200 Subject: [PATCH 1/2] Escape literal dots in mod_rewrite regexes --- .htaccess | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.htaccess b/.htaccess index e1ded52dcd9..0f7d43ab1e1 100644 --- a/.htaccess +++ b/.htaccess @@ -18,12 +18,12 @@ php_value mbstring.func_overload 0 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 ^apps/calendar/caldav.php remote.php/caldav/ [QSA,L] -RewriteRule ^apps/contacts/carddav.php remote.php/carddav/ [QSA,L] +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 ^apps/calendar/caldav\.php remote.php/caldav/ [QSA,L] +RewriteRule ^apps/contacts/carddav\.php remote.php/carddav/ [QSA,L] RewriteRule ^apps/([^/]*)/(.*\.(php))$ index.php?app=$1&getfile=$2 [QSA,L] RewriteRule ^remote/(.*) remote.php [QSA,L] From 61ca2692921770206e6b6ce523203241e7f2f6c7 Mon Sep 17 00:00:00 2001 From: Felix Eckhofer Date: Thu, 24 Apr 2014 15:30:19 +0200 Subject: [PATCH 2/2] Remove trailing tab --- .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 0f7d43ab1e1..714e8af213b 100644 --- a/.htaccess +++ b/.htaccess @@ -21,7 +21,7 @@ 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/([^/]*)/(.*\.(php))$ index.php?app=$1&getfile=$2 [QSA,L]