Fix Bug 22684 and add some additional charsets.

Provides a better workaround for Bug 23421.

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

diff --git a/docs/conf/httpd-std.conf.in b/docs/conf/httpd-std.conf.in
index 8ff47bf3e2be6a470eab9fd97d9fb7334ac42376..9393d295a4840dafedfb9adac62cfd165ce9c9a5 100644 (file)
--- a/docs/conf/httpd-std.conf.in
+++ b/docs/conf/httpd-std.conf.in
@@ -832,27 +832,52 @@ ServerSignature On
     # See http://www.iana.org/assignments/character-sets for the
     # official list of charset names and their respective RFCs.
     #
+    AddCharset us-ascii    .ascii .us-ascii
     AddCharset ISO-8859-1  .iso8859-1  .latin1
     AddCharset ISO-8859-2  .iso8859-2  .latin2 .cen
     AddCharset ISO-8859-3  .iso8859-3  .latin3
     AddCharset ISO-8859-4  .iso8859-4  .latin4
-    AddCharset ISO-8859-5  .iso8859-5  .latin5 .cyr .iso-ru
-    AddCharset ISO-8859-6  .iso8859-6  .latin6 .arb
-    AddCharset ISO-8859-7  .iso8859-7  .latin7 .grk
-    AddCharset ISO-8859-8  .iso8859-8  .latin8 .heb
-    AddCharset ISO-8859-9  .iso8859-9  .latin9 .trk
+    AddCharset ISO-8859-5  .iso8859-5  .cyr .iso-ru
+    AddCharset ISO-8859-6  .iso8859-6  .arb .arabic
+    AddCharset ISO-8859-7  .iso8859-7  .grk .greek
+    AddCharset ISO-8859-8  .iso8859-8  .heb .hebrew
+    AddCharset ISO-8859-9  .iso8859-9  .latin5 .trk
+    AddCharset ISO-8859-10  .iso8859-10  .latin6
+    AddCharset ISO-8859-13  .iso8859-13
+    AddCharset ISO-8859-14  .iso8859-14  .latin8
+    AddCharset ISO-8859-15  .iso8859-15  .latin9
+    AddCharset ISO-8859-16  .iso8859-16  .latin10
     AddCharset ISO-2022-JP .iso2022-jp .jis
     AddCharset ISO-2022-KR .iso2022-kr .kis
     AddCharset ISO-2022-CN .iso2022-cn .cis
     AddCharset Big5        .Big5       .big5
+    AddCharset cn-Big5     .cn-big5
     # For russian, more than one charset is used (depends on client, mostly):
     AddCharset WINDOWS-1251 .cp-1251   .win-1251
     AddCharset CP866       .cp866
+    AddCharset KOI8      .koi8
+    AddCharset KOI8-E      .koi8-e
     AddCharset KOI8-r      .koi8-r .koi8-ru
+    AddCharset KOI8-U      .koi8-u
     AddCharset KOI8-ru     .koi8-uk .ua
     AddCharset ISO-10646-UCS-2 .ucs2
     AddCharset ISO-10646-UCS-4 .ucs4
+    AddCharset UTF-7       .utf7
     AddCharset UTF-8       .utf8
+    AddCharset UTF-16      .utf16
+    AddCharset UTF-16BE    .utf16be
+    AddCharset UTF-16LE    .utf16le
+    AddCharset UTF-32      .utf32
+    AddCharset UTF-32BE    .utf32be
+    AddCharset UTF-32LE    .utf32le
+    AddCharset euc-cn      .euc-cn
+    AddCharset euc-gb      .euc-gb
+    AddCharset euc-jp      .euc-jp
+    AddCharset euc-kr      .euc-kr
+    AddCharset gb2312      .gb2312
+    AddCharset iso-10646-ucs-2 .ucs-2 .iso-10646-ucs-2
+    AddCharset iso-10646-ucs-4 .ucs-4 .iso-10646-ucs-4
+    AddCharset shift_jis   .shift_jis
 
     # The set below does not map to a specific (iso) standard
     # but works on a fairly wide range of browsers. Note that