Make the connection between AddType and AddEncoding a little clearer.

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

diff --git a/conf/httpd.conf-dist b/conf/httpd.conf-dist
index 4113a609911b61bbc1f6ab9fc1143e830f54360a..acacabe5a8f92aeb936b10b0ac8fe2c17fadc8b4 100644 (file)
--- a/conf/httpd.conf-dist
+++ b/conf/httpd.conf-dist
@@ -673,15 +673,6 @@ ServerSignature On
 #
 <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
@@ -760,7 +751,21 @@ ServerSignature On
     # 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",

diff --git a/conf/httpd.conf-dist-nw b/conf/httpd.conf-dist-nw
index 325c165895c33283b16beb3b25b4ab2dfa5a03b7..938aa5c0ce8dd0b5c1c6cdae7e87561caa6abf09 100644 (file)
--- a/conf/httpd.conf-dist-nw
+++ b/conf/httpd.conf-dist-nw
@@ -620,13 +620,25 @@ ServerSignature On
 <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
@@ -701,13 +713,6 @@ ServerSignature On
         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",
     # actions unrelated to filetype. These can be either built into the server

diff --git a/conf/httpd.conf-dist-win b/conf/httpd.conf-dist-win
index 010d938431b1281ca4190b7dd711c3c9b74fe85d..985b94a5ed7d75687382b71b1484f285778c3903 100644 (file)
--- a/conf/httpd.conf-dist-win
+++ b/conf/httpd.conf-dist-win
@@ -720,13 +720,26 @@ ServerSignature On
 <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
@@ -800,13 +813,6 @@ ServerSignature On
         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",
     # actions unrelated to filetype. These can be either built into the server