Update .htaccess

add woff2 type in headers / cache / types

Author: Roosso

.htaccess

@@ -151,28 +151,33 @@ Options All -ExecCGI -Indexes -Includes +FollowSymLinks
 	AddType application/json .json
 	AddType text/css .css
 	AddType text/xml .xml
-	#	Audio
+	# Audio
 	AddType audio/ogg .oga .ogg
 	AddType audio/mp4 .m4a .f4a .f4b
-	#	Video
+	# Video
 	AddType video/ogg .ogv
 	AddType video/mp4 .mp4 .m4v .f4v .f4p
 	AddType video/webm .webm
 	AddType video/x-flv .flv
-	#	SVG
+	# SVG
 	AddType image/svg+xml .svg .svgz
 	AddEncoding gzip .svgz
-	#	Webfonts
+	# Webfonts
 	AddType application/vnd.ms-fontobject .eot
 	AddType application/x-font-ttf .ttf .ttc
-	AddType font/opentype .otf
 	AddType application/x-font-woff .woff
-	#	Assorted types
+	AddType application/x-font-woff2 .woff2
+	AddType font/opentype .otf
+	AddType font/ttf .ttf
+        AddType font/eot .eot
+        AddType font/woff .woff
+        AddType font/woff2 .woff2
+	# Assorted types
 	AddType image/x-icon .ico
 	AddType image/webp .webp
 	AddType text/cache-manifest .appcache .manifest
 	AddType text/x-component .htc
-	AddType application/xml .rss .atom .xml .rdf
+	AddType application/xml rss atom xml .rdf
 	AddType application/x-chrome-extension .crx
 	AddType application/x-opera-extension .oex
 	AddType application/x-xpinstall .xpi
@@ -181,7 +186,7 @@ Options All -ExecCGI -Indexes -Includes +FollowSymLinks
 	AddType text/x-vcard .vcf
 	AddType application/x-shockwave-flash .swf
 	AddType text/vtt .vtt
-	AddType application/octet-stream .doc .mov .avi .pdf .xls .rar .zip .mp3 .wmv .ppt .tar .gz .docx .xlsx
+	# AddType application/octet-stream .doc .mov .avi .pdf .xls .rar .zip .mp3 .wmv .ppt .tar .gz .docx .xlsx
 	# ForceType application/x-httpd-php
 </IfModule>
 
@@ -194,14 +199,16 @@ DirectoryIndex index.php
 <IfModule mod_gzip.c>
 	mod_gzip_on         Yes
 	mod_gzip_dechunk    Yes
-	mod_gzip_item_include file		\.(html?|txt|css|js|php|pl)$
-	mod_gzip_item_include mime		^text\.*
-	mod_gzip_item_include mime		^application/x-javascript.*
-	mod_gzip_item_include mime		^application/x-font-woff.*
-	mod_gzip_item_exclude mime		^image\.*
+	mod_gzip_item_include file	\.(html?|txt|css|js|php|pl)$
+	mod_gzip_item_include handler   ^cgi-script$
+	mod_gzip_item_include mime	^text\.*
+	mod_gzip_item_include mime	^application/x-javascript.*
+	mod_gzip_item_include mime	^application/x-font-woff.*
+	mod_gzip_item_include mime	^application/x-font-woff2.*
+	mod_gzip_item_exclude mime	^image\.*
+	mod_gzip_item_exclude mime	^font\.*
 	mod_gzip_item_exclude rspheader	^Content-Encoding:.*gzip.*
 </IfModule>
-
 <ifModule mod_deflate.c>
 	AddOutputFilterByType DEFLATE application/javascript
 	AddOutputFilterByType DEFLATE application/rss+xml
@@ -212,12 +219,15 @@ DirectoryIndex index.php
 	AddOutputFilterByType DEFLATE application/x-font-truetype
 	AddOutputFilterByType DEFLATE application/x-font-ttf
 	AddOutputFilterByType DEFLATE application/x-font-woff
+	AddOutputFilterByType DEFLATE application/x-font-woff2
 	AddOutputFilterByType DEFLATE application/x-javascript
 	AddOutputFilterByType DEFLATE application/xhtml+xml
 	AddOutputFilterByType DEFLATE application/xml
 	AddOutputFilterByType DEFLATE font/opentype
 	AddOutputFilterByType DEFLATE font/otf
 	AddOutputFilterByType DEFLATE font/ttf
+	AddOutputFilterByType DEFLATE font/woff
+	AddOutputFilterByType DEFLATE font/woff2
 	AddOutputFilterByType DEFLATE image/svg+xml
 	AddOutputFilterByType DEFLATE image/x-icon
 	AddOutputFilterByType DEFLATE image/jpg
@@ -319,23 +329,27 @@ ServerSignature Off
 
 # CACHE AND Headers _________
 <IfModule mod_headers.c>
+	#кэшировать html и htm файлы на один день
 	<FilesMatch "\.(html|htm)$">
 		Header set Cache-Control "max-age=43200"
 	</FilesMatch>
+	#кэшировать css, javascript и текстовые файлы на одну неделю
 	<FilesMatch "\.(js|css|txt)$">
 		Header set Cache-Control "max-age=604800"
 	</FilesMatch>
+	#кэшировать флэш и изображения на месяц
 	<FilesMatch "\.(flv|swf|ico|gif|jpg|jpeg|png|jpe?g)$">
 		Header set Cache-Control "max-age=2592000"
 	</FilesMatch>
+	#отключить кэширование
 	<FilesMatch "\.(pl|php|cgi|spl|scgi|fcgi)$">
-		Header unset Cache-Control
+		#Header unset Cache-Control
 	</FilesMatch>
-	<FilesMatch "\.(ttf|ttc|otf|eot|woff|font.css)$">
-		Header set Access-Control-Allow-Origin "*"
+	<FilesMatch "\.(ttf|ttc|otf|eot|woff|woff2|font.css)$">
+		#Header set Access-Control-Allow-Origin "*"
 	</FilesMatch>
-	<FilesMatch "\.(js|css|gif|png|jpe?g|pdf|xml|oga|ogg|m4a|ogv|mp4|m4v|webm|svg|svgz|eot|ttf|otf|woff|ico|webp|appcache|manifest|htc|crx|oex|xpi|safariextz|vcf)$" >
-		Header unset X-UA-Compatible
+	<FilesMatch "\.(js|css|gif|png|jpe?g|pdf|xml|oga|ogg|m4a|ogv|mp4|m4v|webm|svg|svgz|eot|ttf|otf|woff|woff2|ico|webp|appcache|manifest|htc|crx|oex|xpi|safariextz|vcf)$" >
+		#Header unset X-UA-Compatible
 	</FilesMatch>
 </IfModule>
 <IfModule mod_expires.c>
@@ -365,6 +379,12 @@ ServerSignature Off
 	ExpiresByType application/x-font-ttf "access plus 1 month"
 	ExpiresByType font/opentype "access plus 1 month"
 	ExpiresByType application/x-font-woff "access plus 1 month"
+	ExpiresByType application/x-font-woff2 "access plus 1 month"
+	ExpiresByType font/opentype "access plus 1 month"
+	ExpiresByType font/eot "access plus 1 month"
+	ExpiresByType font/ttf "access plus 1 month"
+	ExpiresByType font/woff "access plus 1 month"
+	ExpiresByType font/woff2 "access plus 1 month"
 	ExpiresByType image/svg+xml "access plus 1 month"
 	ExpiresByType application/vnd.ms-fontobject "access plus 1 month"
 </IfModule>