From: Ian Holsman <ianh@apache.org>
Date: Tue, 3 Sep 2002 15:01:28 +0000 (+0000)
Subject: add image/x-icon to mime.types
X-Git-Tag: AGB_BEFORE_AAA_CHANGES~83
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=04f45ea7b97006f460c0b4be05169b079e752660;p=apache

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 d661672d9c..3c0128156f 100644
--- 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 6eab0ff059..01f759bb50 100644
--- 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