You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by fi...@apache.org on 2003/10/11 03:47:44 UTC
cvs commit: httpd-2.0/docs/conf httpd-std.conf.in httpd-win.conf
fielding 2003/10/10 18:47:44
Modified: . Tag: APACHE_2_0_BRANCH CHANGES STATUS
docs/conf Tag: APACHE_2_0_BRANCH httpd-std.conf.in
httpd-win.conf
Log:
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
Revision Changes Path
No revision
No revision
1.988.2.169 +8 -3 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.988.2.168
retrieving revision 1.988.2.169
diff -u -r1.988.2.168 -r1.988.2.169
--- CHANGES 10 Oct 2003 18:20:54 -0000 1.988.2.168
+++ CHANGES 11 Oct 2003 01:47:43 -0000 1.988.2.169
@@ -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 <ei...@bol.com.br>]
+ rewritten request using "proxy:". The code was adding multiple "proxy:"
+ fields in the rewritten URI. PR: 13946.
+ [Eider Oliveira <ei...@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 @@
*) 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]
1.751.2.493 +1 -11 httpd-2.0/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/httpd-2.0/STATUS,v
retrieving revision 1.751.2.492
retrieving revision 1.751.2.493
diff -u -r1.751.2.492 -r1.751.2.493
--- STATUS 2 Oct 2003 14:35:17 -0000 1.751.2.492
+++ STATUS 11 Oct 2003 01:47:43 -0000 1.751.2.493
@@ -179,16 +179,6 @@
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
No revision
No revision
1.27.2.18 +15 -11 httpd-2.0/docs/conf/httpd-std.conf.in
Index: httpd-std.conf.in
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/conf/httpd-std.conf.in,v
retrieving revision 1.27.2.17
retrieving revision 1.27.2.18
diff -u -r1.27.2.17 -r1.27.2.18
--- httpd-std.conf.in 29 Jul 2003 20:18:02 -0000 1.27.2.17
+++ httpd-std.conf.in 11 Oct 2003 01:47:43 -0000 1.27.2.18
@@ -694,15 +694,6 @@
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
# file in a language the user can understand.
@@ -845,8 +836,21 @@
# 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":
1.75.2.18 +15 -11 httpd-2.0/docs/conf/httpd-win.conf
Index: httpd-win.conf
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/conf/httpd-win.conf,v
retrieving revision 1.75.2.17
retrieving revision 1.75.2.18
diff -u -r1.75.2.17 -r1.75.2.18
--- httpd-win.conf 21 Jul 2003 15:56:46 -0000 1.75.2.17
+++ httpd-win.conf 11 Oct 2003 01:47:43 -0000 1.75.2.18
@@ -613,15 +613,6 @@
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
# file in a language the user can understand.
@@ -764,8 +755,21 @@
# 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":