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/branches/1.3.x@96622 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/conf/mime.types b/conf/mime.types
index 6eab0ff0590f8563eec50435d267836f0bd4684d..01f759bb5044a3aec8be19b709baa2ff5558419e 100644 (file)
--- a/conf/mime.types
+++ b/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

diff --git a/src/CHANGES b/src/CHANGES
index 4ea1395d395e69d7b92bd07791755705239d509c..c923e976ef0025e6dfe75b7d85b132dc05f1bccc 100644 (file)
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 1.3.27
 
+  *) PR 10993: add image/x-icon to mime.types 
+     [Ian Holsman, Peter Bieringer <pb@bieringer.de>
+
   *) Fix a problem in proxy where headers from other modules were
      added to the response headers when this was already done in the
      core already. This resulted in header (and therefore cookie)