From: Ian Holsman <ianh@apache.org>
Date: Tue, 3 Sep 2002 15:26:10 +0000 (+0000)
Subject: add image/x-icon to mime.types
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e69e8443da6a68b61fb6da05a04a74dbc5949a6d;p=thirdparty%2Fapache%2Fhttpd.git

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 6eab0ff0590..01f759bb504 100644
--- 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 4ea1395d395..c923e976ef0 100644
--- 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)