Try to be clearer in describing the connection between AddType and

AddEncoding for defining the meaning of compressed file extensions.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100538 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/conf/httpd-std.conf.in b/docs/conf/httpd-std.conf.in
index cb2e2f6cc98dcf278ee216d10b969e074ea8b04d..8dd7534e5feece7f3a5d1b17fbf5a4240adc5956 100644 (file)
--- a/docs/conf/httpd-std.conf.in
+++ b/docs/conf/httpd-std.conf.in
@@ -703,6 +703,28 @@ ServerSignature On
 </IfModule>
 
 <IfModule mod_mime.c>
+
+    #
+    # AddType allows you to add to or override the MIME configuration
+    # file mime.types for specific file types.
+    #
+    #AddType application/x-gzip .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
+    #
+    # 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
+
     #
     # AddEncoding allows you to have certain browsers (Mosaic/X 2.1+)
     # uncompress information on the fly. Note: Not all browsers support
@@ -856,13 +878,6 @@ ServerSignature On
     AddCharset EUC-KR      .euc-kr
     AddCharset shift_jis   .sjis
 
-    #
-    # AddType allows you to add to or override the MIME configuration
-    # file mime.types for specific file types.
-    #
-    #AddType application/x-gzip .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/docs/conf/httpd-win.conf b/docs/conf/httpd-win.conf
index 713320ba9f330a3a9829c375e975e9409a6a92d5..872326255cb80b16f15de7e4e72e97bc23d95e07 100644 (file)
--- a/docs/conf/httpd-win.conf
+++ b/docs/conf/httpd-win.conf
@@ -614,13 +614,25 @@ HeaderName HEADER.html
 IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t
 
 #
-# AddEncoding allows you to have certain browsers (Mosaic/X 2.1+) uncompress
+# AddType allows you to add to or override the MIME configuration
+# file mime.types for specific file types.
+#
+#AddType application/x-gzip .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.
+# 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
 
 #
 # DefaultLanguage and AddLanguage allows you to specify the language of 
@@ -760,13 +772,6 @@ AddCharset EUC-JP      .euc-jp
 AddCharset EUC-KR      .euc-kr
 AddCharset shift_jis   .sjis
 
-#
-# AddType allows you to add to or override the MIME configuration
-# file mime.types for specific file types.
-#
-#AddType application/x-gzip .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/docs/conf/mime.types b/docs/conf/mime.types
index a329b0a5f61ffc42e0e6b576d7905feef5a81394..8a355977a6d287a47737277efbff6a23be17d2e7 100644 (file)
--- a/docs/conf/mime.types
+++ b/docs/conf/mime.types
@@ -351,7 +351,7 @@ application/x-director              dcr dir dxr
 application/x-dvi              dvi
 application/x-futuresplash     spl
 application/x-gtar             gtar
-application/x-gzip             gz tgz
+application/x-gzip
 application/x-hdf              hdf
 application/x-javascript       js
 application/x-koan             skp skd skt skm