httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From field...@apache.org
Subject cvs commit: apache-1.3/conf httpd.conf-dist httpd.conf-dist-nw httpd.conf-dist-win
Date Thu, 10 Jul 2003 15:20:17 GMT
fielding    2003/07/10 08:20:17

  Modified:    conf     httpd.conf-dist httpd.conf-dist-nw
                        httpd.conf-dist-win
  Log:
  Make the connection between AddType and AddEncoding a little clearer.
  
  Revision  Changes    Path
  1.87      +15 -10    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.86
  retrieving revision 1.87
  diff -u -r1.86 -r1.87
  --- httpd.conf-dist	27 May 2003 19:45:58 -0000	1.86
  +++ httpd.conf-dist	10 Jul 2003 15:20:17 -0000	1.87
  @@ -674,15 +674,6 @@
   <IfModule mod_mime.c>
   
       #
  -    # AddEncoding allows you to have certain browsers (Mosaic/X 2.1+) uncompress
  -    # information on the fly. Note: Not all browsers support this.
  -    # Despite the name similarity, the following Add* directives have nothing
  -    # to do with the FancyIndexing customization directives above.
  -    #
  -    AddEncoding x-compress Z
  -    AddEncoding x-gzip gz tgz
  -
  -    #
       # AddLanguage allows you to specify the language of a document. You can
       # then use content negotiation to give a browser a file in a language
       # it can understand.  
  @@ -760,7 +751,21 @@
       # make certain files to be certain types.
       #
       AddType application/x-tar .tgz
  -    AddType image/x-icon .ico
  +
  +    #
  +    # AddEncoding allows you to have certain browsers uncompress
  +    # information on the fly. Note: Not all browsers support this.
  +    # Despite the name similarity, the following Add* directives have nothing
  +    # to do with the FancyIndexing customization directives above.
  +    #
  +    AddEncoding x-compress .Z
  +    AddEncoding x-gzip .gz .tgz
  +    #
  +    # If the AddEncoding directives above are commented-out, then you
  +    # probably should define those extensions to indicate media types:
  +    #
  +    #AddType application/x-compress .Z
  +    #AddType application/x-gzip .gz .tgz
   
       #
       # AddHandler allows you to map certain file extensions to "handlers",
  
  
  
  1.29      +15 -10    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.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- httpd.conf-dist-nw	27 May 2003 19:48:20 -0000	1.28
  +++ httpd.conf-dist-nw	10 Jul 2003 15:20:17 -0000	1.29
  @@ -620,13 +620,25 @@
   <IfModule mod_mime.c>
   
       #
  -    # AddEncoding allows you to have certain browsers (Mosaic/X 2.1+) uncompress
  +    # AddType allows you to tweak mime.types without actually editing it, or to
  +    # make certain files to be certain types.
  +    #
  +    AddType application/x-tar .tgz
  +
  +    #
  +    # AddEncoding allows you to have certain browsers uncompress
       # information on the fly. Note: Not all browsers support this.
       # Despite the name similarity, the following Add* directives have nothing
       # to do with the FancyIndexing customization directives above.
       #
  -    AddEncoding x-compress Z
  -    AddEncoding x-gzip gz tgz
  +    AddEncoding x-compress .Z
  +    AddEncoding x-gzip .gz .tgz
  +    #
  +    # If the AddEncoding directives above are commented-out, then you
  +    # probably should define those extensions to indicate media types:
  +    #
  +    #AddType application/x-compress .Z
  +    #AddType application/x-gzip .gz .tgz
   
       #
       # AddLanguage allows you to specify the language of a document. You can
  @@ -700,13 +712,6 @@
       <IfModule mod_negotiation.c>
           LanguagePriority en da nl et fr de el it ja kr no pl pt pt-br ru ltz ca es sv tw
       </IfModule>
  -
  -    #
  -    # AddType allows you to tweak mime.types without actually editing it, or to
  -    # 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.71      +16 -10    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.70
  retrieving revision 1.71
  diff -u -r1.70 -r1.71
  --- httpd.conf-dist-win	27 May 2003 19:48:20 -0000	1.70
  +++ httpd.conf-dist-win	10 Jul 2003 15:20:17 -0000	1.71
  @@ -720,13 +720,26 @@
   <IfModule mod_mime.c>
   
       #
  -    # AddEncoding allows you to have certain browsers (Mosaic/X 2.1+) uncompress
  +    # AddType allows you to tweak mime.types without actually editing it, or to
  +    # make certain files to be certain types.
  +    #
  +    AddType application/x-tar .tgz
  +
  +    #
  +    # AddEncoding allows you to have certain browsers uncompress
       # information on the fly. Note: Not all browsers support this.
       # Despite the name similarity, the following Add* directives have nothing
       # to do with the FancyIndexing customization directives above.
       #
  -    AddEncoding x-compress Z
  -    AddEncoding x-gzip gz tgz
  +    AddEncoding x-compress .Z
  +    AddEncoding x-gzip .gz .tgz
  +    #
  +    # If the AddEncoding directives above are commented-out, then you
  +    # probably should define those extensions to indicate media types:
  +    #
  +    #AddType application/x-compress .Z
  +    #AddType application/x-gzip .gz .tgz
  +
       #
       # AddLanguage allows you to specify the language of a document. You can
       # then use content negotiation to give a browser a file in a language
  @@ -799,13 +812,6 @@
       <IfModule mod_negotiation.c>
           LanguagePriority en da nl et fr de el it ja kr no pl pt pt-br ru ltz ca es sv tw
       </IfModule>
  -
  -    #
  -    # AddType allows you to tweak mime.types without actually editing it, or to
  -    # 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",
  
  
  

Mime
View raw message