Skip to content
This repository has been archived by the owner on Nov 3, 2023. It is now read-only.

Commit

Permalink
Add support for .woff2 files (see #7301)
Browse files Browse the repository at this point in the history
  • Loading branch information
leofeyer committed Sep 18, 2014
1 parent b20d455 commit 3ff31cd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .htaccess.default
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
# @see https://github.com/h5bp/html5-boilerplate
##
<IfModule mod_headers.c>
<FilesMatch "\.(ttf|ttc|otf|eot|woff|font\.css)$">
<FilesMatch "\.(ttf|ttc|otf|eot|woff2?|font\.css)$">
Header set Access-Control-Allow-Origin "*"
</FilesMatch>
</IfModule>
Expand Down Expand Up @@ -58,7 +58,7 @@ FileETag None
AddType application/vnd.ms-fontobject eot
AddType application/x-font-ttf ttf ttc
AddType font/opentype otf
AddType application/x-font-woff woff
AddType application/x-font-woff woff woff2
AddType image/x-icon ico
AddType image/webp webp
AddType text/cache-manifest appcache manifest
Expand Down Expand Up @@ -261,7 +261,7 @@ FileETag None
#
# Note that not all environments support mod_rewrite and mod_cache.
##
RewriteCond %{REQUEST_FILENAME} !\.(htm|php|js|css|htc|png|gif|jpe?g|ico|xml|csv|txt|swf|flv|mp4|webm|ogv|mp3|ogg|oga|eot|otf|tt[cf]|woff|svg|svgz|pdf|gz)$
RewriteCond %{REQUEST_FILENAME} !\.(htm|php|js|css|htc|png|gif|jpe?g|ico|xml|csv|txt|swf|flv|mp4|webm|ogv|mp3|ogg|oga|eot|otf|tt[cf]|woff2?|svgz?|pdf|gz)$
RewriteCond %{REQUEST_FILENAME} !-f
RewriteRule .*\.html$ index.php [L]

Expand Down
2 changes: 1 addition & 1 deletion system/config/default.php
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@
. 'odt,ods,odp,odg,ott,ots,otp,otg,pdf,csv,'
. 'doc,docx,dot,dotx,xls,xlsx,xlt,xltx,ppt,pptx,pot,potx,'
. 'mp3,mp4,m4a,m4v,webm,ogg,ogv,wma,wmv,ram,rm,mov,fla,flv,swf,'
. 'ttf,ttc,otf,eot,woff,'
. 'ttf,ttc,otf,eot,woff,woff2,'
. 'css,scss,less,js,html,htm,txt,zip,rar,7z,cto';
$GLOBALS['TL_CONFIG']['uploadPath'] = 'files';
$GLOBALS['TL_CONFIG']['maxFileSize'] = 2048000;
Expand Down

0 comments on commit 3ff31cd

Please sign in to comment.