From: Ian Holsman <ianh@apache.org>
Date: Tue, 3 Sep 2002 15:54:46 +0000 (+0000)
Subject: switch x-icon to httpd.conf instead of mime.types
X-Git-Tag: AGB_BEFORE_AAA_CHANGES~82
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f9838bee5531aebdca5472364e6a616883538f2e;p=apache

switch x-icon to httpd.conf instead of mime.types


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

diff --git a/CHANGES b/CHANGES
index 3c0128156f..eb136b5691 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,6 @@
 Changes with Apache 2.0.41
 
-  *) Add image/x-icon to mime.types PR 10993.
+  *) Add image/x-icon to httpd.conf PR 10993.
      [Ian Holsman, Peter Bieringer <pb@bieringer.de>]
 
   *) Fix FileETags none operation.  PR 12207.
diff --git a/docs/conf/httpd-nw.conf b/docs/conf/httpd-nw.conf
index 43ea7cf588..1d0b41873e 100644
--- a/docs/conf/httpd-nw.conf
+++ b/docs/conf/httpd-nw.conf
@@ -706,6 +706,7 @@ AddCharset shift_jis   .sjis
 # make certain files to be certain types.
 #
 AddType application/x-tar .tgz
+AddType image/x-icon .ico
 
 #
 # AddHandler allows you to map certain file extensions to "handlers",
diff --git a/docs/conf/httpd-std.conf.in b/docs/conf/httpd-std.conf.in
index bf3ddbddca..eaa95e3095 100644
--- a/docs/conf/httpd-std.conf.in
+++ b/docs/conf/httpd-std.conf.in
@@ -819,6 +819,7 @@ AddCharset shift_jis   .sjis
 # file mime.types for specific file types.
 #
 AddType application/x-tar .tgz
+AddType image/x-icon .ico
 
 #
 # AddHandler allows you to map certain file extensions to "handlers":
diff --git a/docs/conf/httpd-win.conf b/docs/conf/httpd-win.conf
index 06cfd9abf2..38c4bebe8c 100644
--- a/docs/conf/httpd-win.conf
+++ b/docs/conf/httpd-win.conf
@@ -719,6 +719,7 @@ AddCharset shift_jis   .sjis
 # file mime.types for specific file types.
 #
 AddType application/x-tar .tgz
+AddType image/x-icon .ico
 
 #
 # AddHandler allows you to map certain file extensions to "handlers":