From 1de612c2a3e61b29e91d667ec572d568a137e9c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Mon, 28 Dec 2020 15:36:23 +0100
Subject: [PATCH] Make sure we properly ass well-known paths to index.php
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 .htaccess | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.htaccess b/.htaccess
index 8f13d0509754f..768a683708af4 100644
--- a/.htaccess
+++ b/.htaccess
@@ -65,7 +65,10 @@
   RewriteRule ^\.well-known/caldav /remote.php/dav/ [R=301,L]
   RewriteRule ^remote/(.*) remote.php [QSA,L]
   RewriteRule ^(?:build|tests|config|lib|3rdparty|templates)/.* - [R=404,L]
-  RewriteCond %{REQUEST_URI} !^/\.well-known/(acme-challenge|pki-validation)/.*
+  RewriteCond %{REQUEST_URI} ^/\.well-known/.*
+  RewriteCond %{REQUEST_URI} !^/\.well-known/(acme-challenge|pki-validation)/?.*
+  RewriteRule ^\.well-known/.* /index.php [QSA,L]
+  RewriteCond %{REQUEST_URI} !^/\.well-known/.*
   RewriteRule ^(?:\.|autotest|occ|issue|indie|db_|console).* - [R=404,L]
 </IfModule>
 <IfModule mod_mime.c>