Without changing the 2.0 default (which differs from 1.3),

try to be clearer in describing the connection between
AddType and AddEncoding for defining the meaning of
compressed file extensions.

Reviewed by:	Andre Malo, Justin Erenkrantz, Erik Abele

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

diff --git a/CHANGES b/CHANGES
index eb61b180f8b69b13be5bbf4332a9e8ee4f879b57..f51d3a088388a2efd847c6d313b782a69451fe9f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,11 +1,16 @@
 Changes with Apache 2.0.48
 
+  *) Update httpd-*.conf to be clearer in describing the connection
+     between AddType and AddEncoding for defining the meaning of
+     compressed file extensions. [Roy Fielding]
+
   *) mod_rewrite: Don't die silently when failing to open RewriteLogs.
      PR 23416.  [André Malo]
 
   *) mod_rewrite: Fix mod_rewrite's support of the [P] option to send
-      rewritten request using "proxy:". The code was adding multiple "proxy:"
-      fields in the rewritten URI. PR: 13946. [Eider Oliveira <eider@bol.com.br>]
+     rewritten request using "proxy:". The code was adding multiple "proxy:"
+     fields in the rewritten URI. PR: 13946.
+     [Eider Oliveira <eider@bol.com.br>]
 
   *) cache_util: Fix ap_check_cache_freshness to check max_age, smax_age, and
      expires as directed in RFC 2616. [Thomas Castelle tcastelle@generali.fr]
@@ -3689,7 +3694,7 @@ Changes with Apache 2.0.17
 
   *) Allow module authors to add a module to their Apache build using
      --with-module, without re-running buildconf.  The syntax is:
-       --with-module=module_type:/path/to/module.c
+         --with-module=module_type:/path/to/module.c
      The configure script will copy the module.c file to 
      modules/module_type, and it will be added to the relevant Makefiles.
      currently, this only works for static modules.  [Ryan Bloom]

diff --git a/STATUS b/STATUS
index 6dc8eb024ce3d04b06be03399dda938acf77aa83..abc56fd47a1ef847f2c1fd5b24f9d26d7401bb77 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/10/02 14:35:17 $]
+Last modified at [$Date: 2003/10/11 01:47:43 $]
 
 Release:
 
@@ -179,16 +179,6 @@ PATCHES TO PORT FROM 2.1
               Yes, I think, a useful error message is better than
               a coredump in this case.
 
-    * httpd-std.conf: Try to be clearer in describing the connection
-      between AddType and AddEncoding for defining the meaning of
-      compressed file extensions.  Follows mime.types change above.
-        docs/conf/httpd-std.conf.in: r1.47, 1.53
-        docs/conf/httpd-win.conf:    r1.93
-      jerenkrantz asks: Why does httpd-std.conf.in have two copies of the
-                        AddEncoding directives?  This is a typo, right?
-            nd replies: Sure. 1.53 fixes that.
-      +1: fielding, nd, jerenkrantz, erikabele
-
     * More ab fixes; r1.129 fixes what looks like a trivial error in the 
       SSL support; r1.130 adds some state-handling fixes related to
       ab's breakage in 2.0.47

diff --git a/docs/conf/httpd-std.conf.in b/docs/conf/httpd-std.conf.in
index 7bfd6556e969aebc9492597b130e1b12a1b4ea47..54e87f52c42998496138974b6cb66f4d5a3a14bd 100644 (file)
--- a/docs/conf/httpd-std.conf.in
+++ b/docs/conf/httpd-std.conf.in
@@ -693,15 +693,6 @@ HeaderName HEADER.html
 #
 IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t
 
-#
-# 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
-
 #
 # DefaultLanguage and AddLanguage allows you to specify the language of 
 # a document. You can then use content negotiation to give a browser a 
@@ -845,8 +836,21 @@ 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-tar .tgz
-AddType image/x-icon .ico
+#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
+#
+# 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/docs/conf/httpd-win.conf b/docs/conf/httpd-win.conf
index 7c4d40f73c10e608d7fd4bcb1966ba196904073d..c3cff908e1b4b8797298440bab8375c1d89da681 100644 (file)
--- a/docs/conf/httpd-win.conf
+++ b/docs/conf/httpd-win.conf
@@ -612,15 +612,6 @@ HeaderName HEADER.html
 #
 IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t
 
-#
-# 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
-
 #
 # DefaultLanguage and AddLanguage allows you to specify the language of 
 # a document. You can then use content negotiation to give a browser a 
@@ -764,8 +755,21 @@ 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-tar .tgz
-AddType image/x-icon .ico
+#AddType application/x-tar .tgz
+#
+# 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
+#
+# 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":