jim 00/02/04 16:33:22
Modified: htdocs/manual/mod core.html
src/main http_core.c
Log:
Try to reduce confusion over multiple and possible "conflicting"
versions of the term "default" by changing AddDefaultCharset to
be of the mode Off | On | charset
Revision Changes Path
1.165 +7 -5 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.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- core.html 2000/02/03 14:22:25 1.164
+++ core.html 2000/02/05 00:33:18 1.165
@@ -166,13 +166,13 @@
<H2><A NAME="adddefaultcharset">AddDefaultCharset directive</A></H2>
<A HREF="directive-dict.html#Syntax" REL="Help"><STRONG>Syntax:</STRONG></A>
-AddDefaultCharset <EM>None / Default / charset</EM><BR>
+AddDefaultCharset <EM>Off / On / charset</EM><BR>
<A HREF="directive-dict.html#Context" REL="Help"
><STRONG>Context:</STRONG></A>
all<BR>
<A HREF="directive-dict.html#Status" REL="Help"
><STRONG>Status:</STRONG></A>
core<BR>
<A HREF="directive-dict.html#Default"
REL="Help"><STRONG>Default:</STRONG></A>
-<CODE>AddDefaultCharset None</CODE><BR>
+<CODE>AddDefaultCharset Off</CODE><BR>
<A HREF="directive-dict.html#Compatibility" REL="Help"><STRONG>Compatibility:
</STRONG></A> AddDefaultCharset is only available in Apache 1.3.12 and
later<P>
@@ -180,9 +180,11 @@
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 <CODE>META</CODE> tag. A setting
-of <CODE>AddDefaultCharset None</CODE> disables this functionality.
-<CODE>AddDefaultCharset Default</CODE> is the exact same as
-<code>AddDefaultCharsetName iso-8859-1</code>.
+of <CODE>AddDefaultCharset Off</CODE> disables this functionality.
+<CODE>AddDefaultCharset On</CODE> enables Apache's internal
+default charset of <code>iso-8859-1</code> as required by the
+directive. You can also specify an alternate charset to be used;
+e.g. <code>AddDefaultCharset utf-8</code>.
<P><HR>
<H2><A NAME="addmodule">AddModule directive</A></H2>
1.280 +3 -2 apache-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.279
retrieving revision 1.280
diff -u -r1.279 -r1.280
--- http_core.c 2000/02/03 14:22:33 1.279
+++ http_core.c 2000/02/05 00:33:21 1.280
@@ -1053,9 +1053,10 @@
if (err != NULL) {
return err;
}
- if (!strcasecmp(arg, "None"))
+ if (!strcasecmp(arg, "Off")) {
d->add_default_charset = 0;
- else if (!strcasecmp(arg, "Default")) {
+ }
+ else if (!strcasecmp(arg, "On")) {
d->add_default_charset = 1;
d->add_default_charset_name = DEFAULT_ADD_DEFAULT_CHARSET_NAME;
}
