add image/x-icon to mime.types

PR: 10993
Submitted by:	 Peter Bieringer <pb@bieringer.de>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96621 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index d661672d9c00d85423a924312aab4c26037f98e3..3c0128156f3eebc2796f1bd0a25aba6c11da60b2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.41
 
+  *) Add image/x-icon to mime.types PR 10993.
+     [Ian Holsman, Peter Bieringer <pb@bieringer.de>]
+
   *) Fix FileETags none operation.  PR 12207.
      [Justin Erenkrantz, Andrew Ho <andrew@tellme.com>]
 

diff --git a/docs/conf/mime.types b/docs/conf/mime.types
index 6eab0ff0590f8563eec50435d267836f0bd4684d..01f759bb5044a3aec8be19b709baa2ff5558419e 100644 (file)
--- a/docs/conf/mime.types
+++ b/docs/conf/mime.types
@@ -380,6 +380,7 @@ image/vnd.svf
 image/vnd.wap.wbmp             wbmp
 image/vnd.xiff
 image/x-cmu-raster             ras
+image/x-icon            ico
 image/x-portable-anymap                pnm
 image/x-portable-bitmap                pbm
 image/x-portable-graymap       pgm