diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2018-11-18 14:07:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-18 14:07:22 +0100 |
| commit | 14f7b2c46633b7a21656872ebf6d809398a342e4 (patch) | |
| tree | 21fa67fdbca671c32841d7bcce1c0c12793a28b5 | |
| parent | 8bf7ec26e0b064f55224a202f2137b19eb2432d6 (diff) | |
| parent | b9f2ce2796a6aab3192033e7d02d9c581eb670b8 (diff) | |
| download | nextcloud-server-14f7b2c46633b7a21656872ebf6d809398a342e4.tar.gz nextcloud-server-14f7b2c46633b7a21656872ebf6d809398a342e4.zip | |
Merge pull request #12518 from nextcloud/bugfix/noid/htaccess-woff2
Fix loading of .woff2 files in .htaccess
| -rw-r--r-- | .htaccess | 2 | ||||
| -rw-r--r-- | 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"; |