Commit bb01cfef authored by Jim Jagielski's avatar Jim Jagielski
Browse files

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 :)

PR:
Obtained from:
Submitted by:
Reviewed by:	Martin


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

docs/manual/mod/core.html

+9 −25
Changes for docs/manual/mod/core.html: 9 added lines, 25 removed lines.
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ always available. 
<LI><A HREF="#accessconfig">AccessConfig</A>

<LI><A HREF="#accessfilename">AccessFileName</A>

<LI><A HREF="#adddefaultcharset">AddDefaultCharset</A>

<LI><A HREF="#adddefaultcharsetname">AddDefaultCharsetName</A>

<LI><A HREF="#addmodule">AddModule</A>

<LI><A HREF="#allowoverride">AllowOverride</A>

<LI><A HREF="#authname">AuthName</A>
@@ -167,38 +166,23 @@ AllowOverride None<BR> 


<H2><A NAME="adddefaultcharset">AddDefaultCharset directive</A></H2>

<A HREF="directive-dict.html#Syntax" REL="Help"><STRONG>Syntax:</STRONG></A> 

AddDefaultCharset <EM>on / off</EM><BR>

AddDefaultCharset <EM>None / Default / 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 off</CODE><BR>

<CODE>AddDefaultCharset None</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>

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 

<CODE>META</CODE> tag.  The character set added is specified by the 

<CODE>AddDefaultCharsetName</CODE> directive.

<P><HR>



<H2><A NAME="adddefaultcharsetname">AddDefaultCharsetName directive</A></H2>

<A HREF="directive-dict.html#Syntax" REL="Help"><STRONG>Syntax:</STRONG></A> 

AddDefaultCharsetName <EM>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>AddDefaultCharsetName iso-8859-1</CODE><BR>

<A HREF="directive-dict.html#Compatibility" REL="Help"><STRONG>Compatibility:

</STRONG></A> AddDefaultCharsetName is only available in Apache 1.3.12 and 

</STRONG></A> AddDefaultCharset is only available in Apache 1.3.12 and 

later<P>

This directive specifies the name of the character set that will be added

if the <A HREF="#adddefaultcharset">AddDefaultCharset</A> 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 <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>.

<P><HR>



<H2><A NAME="addmodule">AddModule directive</A></H2>

docs/manual/mod/directives.html

+0 −1
Changes for docs/manual/mod/directives.html: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ of the terms used in their descriptions available. 
<LI><A HREF="mod_autoindex.html#addaltbytype">AddAltByType</A>

<LI><A HREF="mod_mime.html#addcharset">AddCharset</A>

<LI><A HREF="core.html#adddefaultcharset">AddDefaultCharset</A>

<LI><A HREF="core.html#adddefaultcharsetname">AddDefaultCharsetName</A>

<LI><A HREF="mod_autoindex.html#adddescription">AddDescription</A>

<LI><A HREF="mod_mime.html#addencoding">AddEncoding</A>

<LI><A HREF="mod_mime.html#addhandler">AddHandler</A>