From 37b5fec090d00f38de64b591bcddcb205aadf8ee Mon Sep 17 00:00:00 2001
From: Paul Irish <paul.irish@gmail.com>
Date: Wed, 15 Dec 2010 10:25:41 -0800
Subject: [PATCH] changing mimetype of .ico files to "image/x-icon". Details
 follow:

While Wikipedia would lead you to be believe one thing...
  http://en.wikipedia.org/wiki/ICO_(file_format)#MIME_type
... specifically that the vnd.microsoft.icon mime type is correct..

Well that's wrong.

It does work in the address bar, IE can also use an .ico file as an
<img src> in some cases. But it has to be served as image/x-icon
instead.

So thanks a lot wikipedia & jimmy wales' face. Psh.

Thanks a bunch Jonathan Neal. Fixes #219
---
 .htaccess | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.htaccess b/.htaccess
index 3648c06481..5ae74c6624 100644
--- a/.htaccess
+++ b/.htaccess
@@ -94,7 +94,7 @@ AddType font/opentype                  otf
 AddType font/woff                      woff
 
 # assorted types                                      
-AddType image/vnd.microsoft.icon       ico
+AddType image/x-icon                   ico
 AddType image/webp                     webp
 AddType text/cache-manifest            manifest
 AddType text/x-component               htc
@@ -196,7 +196,7 @@ AddType application/octet-stream       safariextz
   ExpiresByType application/rss+xml       "access plus 1 hour"
 
 # favicon (cannot be renamed)
-  ExpiresByType image/vnd.microsoft.icon  "access plus 1 week" 
+  ExpiresByType image/x-icon              "access plus 1 week" 
 
 # media: images, video, audio
   ExpiresByType image/gif                 "access plus 1 month"