From 439fb6657061b92e13de3c11dac08482a98ce63f Mon Sep 17 00:00:00 2001 From: Ian Holsman Date: Wed, 4 Sep 2002 04:39:42 +0000 Subject: [PATCH] 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 --- conf/httpd.conf-dist | 1 + conf/httpd.conf-dist-nw | 1 + conf/httpd.conf-dist-win | 1 + conf/mime.types | 1 - src/CHANGES | 2 +- 5 files changed, 4 insertions(+), 2 deletions(-) diff --git a/conf/httpd.conf-dist b/conf/httpd.conf-dist index f8b9ee6fe57..3c755517943 100644 --- 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 3c25dd6954a..276ef81dc2c 100644 --- 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 15c32fcc871..fa2835a78cf 100644 --- 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 01f759bb504..6eab0ff0590 100644 --- 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 c923e976ef0..2171161912a 100644 --- 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 *) Fix a problem in proxy where headers from other modules were -- 2.47.2