From b9f2ce2796a6aab3192033e7d02d9c581eb670b8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Sun, 18 Nov 2018 11:02:20 +0100
Subject: [PATCH] Fix loading of .woff2 files in .htaccess
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 .htaccess             | 2 +-
 lib/private/Setup.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.htaccess b/.htaccess
index 81a53f9989e..63d50a2b9d7 100644
--- a/.htaccess
+++ b/.htaccess
@@ -26,7 +26,7 @@
   </FilesMatch>
 
   # Let browsers cache WOFF files for a week
-  <FilesMatch "\.woff$">
+  <FilesMatch "\.woff2?$">
     Header set Cache-Control "max-age=604800"
   </FilesMatch>
 </IfModule>
diff --git a/lib/private/Setup.php b/lib/private/Setup.php
index 7e235d03fdc..0278191587a 100644
--- a/lib/private/Setup.php
+++ b/lib/private/Setup.php
@@ -504,7 +504,7 @@ class Setup {
 			$content .= "\n  Options -MultiViews";
 			$content .= "\n  RewriteRule ^core/js/oc.js$ index.php [PT,E=PATH_INFO:$1]";
 			$content .= "\n  RewriteRule ^core/preview.png$ index.php [PT,E=PATH_INFO:$1]";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !\\.(css|js|svg|gif|png|html|ttf|woff|ico|jpg|jpeg)$";
+			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !\\.(css|js|svg|gif|png|html|ttf|woff2?|ico|jpg|jpeg)$";
 			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !core/img/favicon.ico$";
 			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !core/img/manifest.json$";
 			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/remote.php";
-- 
2.39.5