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 3c0128156f3eebc2796f1bd0a25aba6c11da60b2..eb136b569163dd7e87ffc99be2b6304ebe679301 100644 (file)
--- 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 43ea7cf5881757461055503845a1b5980d209f99..1d0b41873e0fdc35fdc857fa66e219c14f6137e9 100644 (file)
--- 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 bf3ddbddca10033ca2a510f05ecc7a13db581c8a..eaa95e309582a08c0cdfb762f803e5a36e50ff9f 100644 (file)
--- 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 06cfd9abf2d4aeca0a47f0ad4dc45d770f5109dd..38c4bebe8c914628f30a6e4b7b3854ffef6512d8 100644 (file)
--- 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":