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

(could have sworn I committed this earlier this morning)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@96630 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/conf/httpd.conf-dist b/conf/httpd.conf-dist
index f8b9ee6fe5758a335d5adabb91860df9caf17789..3c75551794374965fa0e1140f7ed233e87cbb498 100644 (file)
--- a/conf/httpd.conf-dist
+++ b/conf/httpd.conf-dist
@@ -766,6 +766,7 @@ ServerSignature On
     # 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/conf/httpd.conf-dist-nw b/conf/httpd.conf-dist-nw
index 3c25dd6954a2e26c8d06e5fc79a7a0e862d68a69..276ef81dc2c98213676d934a8e76e55aee3089b3 100644 (file)
--- a/conf/httpd.conf-dist-nw
+++ b/conf/httpd.conf-dist-nw
@@ -711,6 +711,7 @@ ServerSignature On
     # 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/conf/httpd.conf-dist-win b/conf/httpd.conf-dist-win
index 15c32fcc8715f8bc6c7f09be40b9b8f14af2ce7e..fa2835a78cfbcac6e9ed0d181b46ed569221cc94 100644 (file)
--- a/conf/httpd.conf-dist-win
+++ b/conf/httpd.conf-dist-win
@@ -811,6 +811,7 @@ ServerSignature On
     # 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/conf/mime.types b/conf/mime.types
index 01f759bb5044a3aec8be19b709baa2ff5558419e..6eab0ff0590f8563eec50435d267836f0bd4684d 100644 (file)
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -380,7 +380,6 @@ 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 c923e976ef0025e6dfe75b7d85b132dc05f1bccc..2171161912aeb3f741964dc4195cdb05d3f124dd 100644 (file)
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,6 +1,6 @@
 Changes with Apache 1.3.27
 
-  *) PR 10993: add image/x-icon to mime.types 
+  *) PR 10993: add image/x-icon to default httpd.conf files
      [Ian Holsman, Peter Bieringer <pb@bieringer.de>
 
   *) Fix a problem in proxy where headers from other modules were