jim 00/02/03 06:22:36
Modified:htdocs/manual/mod core.html directives.html
src CHANGES
src/main http_core.c
Log:
Streamline the AddDefaultCharset directive. Now this one directive
controls the entire 'charset' specification setup. If there is
heartburn, I have no trouble with backing this out, but it makes
live easier for those not using the "default" charset, and reduces
directive bloat a bit :)
Reviewed by: Martin
Revision ChangesPath
1.164 +9 -25 apache-1.3/htdocs/manual/mod/core.html
Index: core.html
===
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/core.html,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- core.html 2000/02/02 20:43:11 1.163
+++ core.html 2000/02/03 14:22:25 1.164
@@ -24,7 +24,6 @@
AccessConfig
AccessFileName
AddDefaultCharset
-AddDefaultCharsetName
AddModule
AllowOverride
AuthName
@@ -167,38 +166,23 @@
AddDefaultCharset directive
Syntax:
-AddDefaultCharset on / off
+AddDefaultCharset None / Default / charset
Context:
all
Status:
core
Default:
-AddDefaultCharset off
+AddDefaultCharset None
Compatibility:
- AddDefaultCharset is only available in Apache 1.3.12 and
later
-If enabled, any response that does not have any parameter on the content
-type in the HTTP headers will have a charset parameter added specifying
-the character set the client should use for the document. This will
-override any character set specified in the body of the document via a
-META tag. The character set added is specified by the
-AddDefaultCharsetName directive.
-
-
-AddDefaultCharsetName directive
-Syntax:
-AddDefaultCharsetName charset
-Context:
-all
-Status:
-core
-Default:
-AddDefaultCharsetName iso-8859-1
-Compatibility:
- AddDefaultCharsetName is only available in Apache 1.3.12 and
+ AddDefaultCharset is only available in Apache 1.3.12 and
later
This directive specifies the name of the character set that will be added
-if the AddDefaultCharset directive is
-enabled.
+to any response that does not have any parameter on the content
+type in the HTTP headers. This will override any character set specified
+in the body of the document via a META tag. A setting
+of AddDefaultCharset None disables this functionality.
+AddDefaultCharset Default is the exact same as
+AddDefaultCharsetName iso-8859-1.
AddModule directive
1.63 +0 -1 apache-1.3/htdocs/manual/mod/directives.html
Index: directives.html
===
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/directives.html,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- directives.html 2000/02/03 11:54:28 1.62
+++ directives.html 2000/02/03 14:22:26 1.63
@@ -32,7 +32,6 @@
AddAltByType
AddCharset
AddDefaultCharset
-AddDefaultCharsetName
AddDescription
AddEncoding
AddHandler
1.1505+3 -4 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1504
retrieving revision 1.1505
diff -u -r1.1504 -r1.1505
--- CHANGES 2000/02/02 20:43:28 1.1504
+++ CHANGES 2000/02/03 14:22:28 1.1505
@@ -4,10 +4,9 @@
ap_send_error_response(), such as the default 404 page.
[Marc Slemko]
- *) Add the AddDefaultCharset and AddDefaultCharsetName directives.
- These allow you to tell Apache to specify the given character
- set on any document that does not have one explicitly specified in
- the headers. [Marc Slemko]
+ *) Add the AddDefaultCharset directive. This allows you to specify
+ the given character set on any document that does not have one
+ explicitly specified in the headers. [Marc Slemko, Jim Jagielski]
*) Properly escape various messages output to the client from a number
of modules and places in the core code. [Marc Slemko]
1.279 +12 -16apache-1.3/src/main/http_core.c
Index: http_core.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_core.c,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -r1.278 -r1.279
--- http_core.c 2000/02/02 20:43:46 1.278
+++ http_core.c 2000/02/03 14:22:33 1.279
@@ -1047,24 +1047,22 @@
#endif /*GPROF*/
static const char *set_add_default_charset(cmd_parms *cmd,
- core_dir_config *d, int arg)
-{
-const char *err = ap_check_cmd_context(cmd, NOT_IN_LIMIT);
-if (err != NULL) {
-return err;
-