From c4ebc5c4a9e403d854b85b4138ffc3f6957689cc Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 8 Mar 2016 18:20:14 +0100
Subject: CSP for SVG

And moved .htaccess rules in the folder there are used
https://github.com/FreshRSS/FreshRSS/issues/1114
---
 p/.htaccess | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'p/.htaccess')

diff --git a/p/.htaccess b/p/.htaccess
index 2b1e27a88..4321c82d7 100644
--- a/p/.htaccess
+++ b/p/.htaccess
@@ -6,13 +6,8 @@ FileETag	None
 AddDefaultCharset	UTF-8
 
 <IfModule mod_mime.c>
-	AddType application/json .map
-	AddType application/font-woff .woff
-
-	AddCharset	UTF-8	.css
 	AddCharset	UTF-8	.html
 	AddCharset	UTF-8	.js
-	AddCharset	UTF-8	.svg
 </IfModule>
 
 <IfModule mod_deflate.c>
@@ -21,15 +16,9 @@ AddDefaultCharset	UTF-8
 
 <IfModule mod_expires.c>
 	ExpiresActive	on
-	ExpiresByType	application/font-woff	"access plus 1 month"
 	ExpiresByType	application/javascript	"access plus 1 month"
-	ExpiresByType	application/json	"access plus 1 month"
 	ExpiresByType	application/xhtml+xml	"access plus 1 month"
-	ExpiresByType	image/gif	"access plus 1 month"
-	ExpiresByType	image/png	"access plus 1 month"
-	ExpiresByType	image/svg+xml	"access plus 1 month"
 	ExpiresByType	image/x-icon	"access plus 1 month"
-	ExpiresByType	text/css	"access plus 1 month"
 	ExpiresByType	text/html	"access plus 1 month"
 	ExpiresByType	text/javascript	"access plus 1 month"
 	<FilesMatch "\.php$">
@@ -38,7 +27,7 @@ AddDefaultCharset	UTF-8
 </IfModule>
 
 <IfModule mod_headers.c>
-	<FilesMatch "\.(css|html|js|ico|gif|png|woff)$">
+	<FilesMatch "\.(css|gif|html|ico|js|png|svg|woff)$">
 		Header	merge Cache-Control "public"
 	</FilesMatch>
 </IfModule>
-- 
cgit v1.2.3