You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ia...@apache.org on 2002/09/04 06:39:42 UTC

cvs commit: apache-1.3/conf httpd.conf-dist httpd.conf-dist-nw httpd.conf-dist-win mime.types

ianh        2002/09/03 21:39:42

  Modified:    src      CHANGES
               conf     httpd.conf-dist httpd.conf-dist-nw
                        httpd.conf-dist-win mime.types
  Log:
  switch x-icon to httpd.conf instead of mime.types
  (could have sworn I committed this earlier this morning)
  
  Revision  Changes    Path
  1.1846    +1 -1      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1845
  retrieving revision 1.1846
  diff -u -r1.1845 -r1.1846
  --- CHANGES	3 Sep 2002 15:26:10 -0000	1.1845
  +++ CHANGES	4 Sep 2002 04:39:41 -0000	1.1846
  @@ -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
  
  
  
  1.81      +1 -0      apache-1.3/conf/httpd.conf-dist
  
  Index: httpd.conf-dist
  ===================================================================
  RCS file: /home/cvs/apache-1.3/conf/httpd.conf-dist,v
  retrieving revision 1.80
  retrieving revision 1.81
  diff -u -r1.80 -r1.81
  --- httpd.conf-dist	5 Mar 2002 16:19:12 -0000	1.80
  +++ httpd.conf-dist	4 Sep 2002 04:39:41 -0000	1.81
  @@ -766,6 +766,7 @@
       # 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",
  
  
  
  1.23      +1 -0      apache-1.3/conf/httpd.conf-dist-nw
  
  Index: httpd.conf-dist-nw
  ===================================================================
  RCS file: /home/cvs/apache-1.3/conf/httpd.conf-dist-nw,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- httpd.conf-dist-nw	2 Apr 2002 16:52:23 -0000	1.22
  +++ httpd.conf-dist-nw	4 Sep 2002 04:39:41 -0000	1.23
  @@ -711,6 +711,7 @@
       # 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",
  
  
  
  1.66      +1 -0      apache-1.3/conf/httpd.conf-dist-win
  
  Index: httpd.conf-dist-win
  ===================================================================
  RCS file: /home/cvs/apache-1.3/conf/httpd.conf-dist-win,v
  retrieving revision 1.65
  retrieving revision 1.66
  diff -u -r1.65 -r1.66
  --- httpd.conf-dist-win	5 Mar 2002 16:19:12 -0000	1.65
  +++ httpd.conf-dist-win	4 Sep 2002 04:39:41 -0000	1.66
  @@ -811,6 +811,7 @@
       # 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",
  
  
  
  1.36      +0 -1      apache-1.3/conf/mime.types
  
  Index: mime.types
  ===================================================================
  RCS file: /home/cvs/apache-1.3/conf/mime.types,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- mime.types	3 Sep 2002 15:26:10 -0000	1.35
  +++ mime.types	4 Sep 2002 04:39:42 -0000	1.36
  @@ -380,7 +380,6 @@
   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