Commit b1cfdcae authored by Martin Kraemer's avatar Martin Kraemer
Browse files

Fix charset names (see ftp://ftp.isi.edu/in-notes/iana/assignments/character-sets) 

and resynchronize unix & win versions


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

docs/conf/httpd-std.conf

+10 −10
Changes for docs/conf/httpd-std.conf: 10 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -712,12 +712,14 @@ AddDefaultCharset ISO-8859-1 
# Commonly used filename extensions to character sets. You probably

# want to avoid clashes with the language extensions, unless you

# are good at carefully testing your setup after each change.

# See ftp://ftp.isi.edu/in-notes/iana/assignments/character-sets for

# the official list of charset names and their respective RFCs

#

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

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
@@ -725,14 +727,14 @@ AddCharset ISO-8859-9 .iso8859-9 .latin9 .trk 
AddCharset ISO-2022-JP .iso2022-jp .jis

AddCharset ISO-2022-KR .iso2022-kr .kis

AddCharset ISO-2022-CN .iso2022-cn .cis

AddCharset CP-1251     .cp-1251    .win-1251

AddCharset CP-866      .cp-866

AddCharset ISO-8859-5  .iso-ru

AddCharset KOI8-R      .koi8-r

AddCharset UCS-2       .ucs2

AddCharset UCS-4       .ucs4

# For russian, more than one charset is used (depends on client, mostly):

AddCharset WINDOWS-1251 .cp-1251   .win-1251

AddCharset CP866       .cp866

AddCharset KOI8-r      .koi8-r .koi8-ru

AddCharset KOI8-ru     .koi8-uk .ua

AddCharset ISO-10646-UCS-2 .ucs2

AddCharset ISO-10646-UCS-4 .ucs4

AddCharset UTF-8       .utf8

AddCharset UTF-16      .utf16



# The set below does not map to a specific (iso) standard

# but works on a fairly wide range of browsers. Note that
@@ -742,8 +744,6 @@ AddCharset UTF-16 .utf16 
# See ftp://ftp.isi.edu/in-notes/iana/assignments/character-sets

# for a list of sorts. But browsers support few.

#

AddCharset KOI8-r      .koi8-ru .ru

AddCharset KOI8-ru     .koi8-uk .ua

AddCharset GB2312      .gb2312 .gb 

AddCharset utf-7       .utf7

AddCharset utf-8       .utf8

docs/conf/httpd-win.conf

+59 −4
Changes for docs/conf/httpd-win.conf: 59 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -586,6 +586,7 @@ AddEncoding x-gzip gz tgz 
# Portugese (pt) - Luxembourgeois* (ltz)

# Spanish (es) - Swedish (sv) - Catalan (ca) - Czech(cz)

# Polish (pl) - Brazilian Portuguese (pt-br) - Japanese (ja)

# Russian (ru)

#

AddLanguage da .dk

AddLanguage nl .nl
@@ -596,11 +597,8 @@ AddLanguage de .de 
AddLanguage el .el

AddLanguage it .it

AddLanguage ja .ja

AddCharset ISO-2022-JP .iso2022-jp

AddLanguage pl .po

AddLanguage kr .kr

AddCharset ISO-2022-KR .iso2022-kr

AddCharset ISO-8859-2 .iso8859-pl

AddLanguage pt .pt

AddLanguage no .no

AddLanguage pt-br .pt-br
@@ -609,6 +607,7 @@ AddLanguage ca .ca 
AddLanguage es .es

AddLanguage sv .se

AddLanguage cz .cz

AddLanguage ru .ru



# LanguagePriority allows you to give precedence to some languages

# in case of a tie during content negotiation.
@@ -616,7 +615,63 @@ AddLanguage cz .cz 
# Just list the languages in decreasing order of preference. We have

# more or less alphabetized them here. You probably want to change this.

#

LanguagePriority en da nl et fr de el it ja kr no pl pt pt-br ltz ca es sv

LanguagePriority en da nl et fr de el it ja kr no pl pt pt-br ru ltz ca es sv



# Specify a default charset for all pages sent out. This is

# always a good idea and opens the door for future internationalisation

# of your web site, should you ever want it. Specifying it as

# a default does little harm; as the standard dictates that a page

# is in iso-8859-1 (latin1) unless specified otherwise i.e. you

# are merely stating the obvious. There are also some security

# reasons in browsers, related to javascript and URL parsing

# which encourage you to always set a default char set.

#

AddDefaultCharset	ISO-8859-1



#

# Commonly used filename extensions to character sets. You probably

# want to avoid clashes with the language extensions, unless you

# are good at carefully testing your setup after each change.

# See ftp://ftp.isi.edu/in-notes/iana/assignments/character-sets for

# the official list of charset names and their respective RFCs

#

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-2022-JP .iso2022-jp .jis

AddCharset ISO-2022-KR .iso2022-kr .kis

AddCharset ISO-2022-CN .iso2022-cn .cis

# For russian, more than one charset is used (depends on client, mostly):

AddCharset WINDOWS-1251 .cp-1251   .win-1251

AddCharset CP866       .cp866

AddCharset KOI8-r      .koi8-r .koi8-ru

AddCharset KOI8-ru     .koi8-uk .ua

AddCharset ISO-10646-UCS-2 .ucs2

AddCharset ISO-10646-UCS-4 .ucs4

AddCharset UTF-8       .utf8



# The set below does not map to a specific (iso) standard

# but works on a fairly wide range of browsers. Note that

# capitalization actually matters (it should not, but it

# does for some browsers).

#

# See ftp://ftp.isi.edu/in-notes/iana/assignments/character-sets

# for a list of sorts. But browsers support few.

#

AddCharset GB2312      .gb2312 .gb 

AddCharset utf-7       .utf7

AddCharset utf-8       .utf8

AddCharset big5	       .big5 .b5

AddCharset EUC-TW      .euc-tw	

AddCharset EUC-JP      .euc-jp

AddCharset EUC-KR      .euc-kr

AddCharset shift_jis   .sjis



#

# AddType allows you to tweak mime.types without actually editing it, or to

docs/docroot/index.html.ru.cp866

0 → 100644
+34 −0
Changes for docs/docroot/index.html.ru.cp866: 34 added lines, 0 removed lines.
Original line number Diff line number Diff line 
<!doctype html public "-//w3c//dtd html 4.0 transitional//en">

<html>

<head>

   <meta http-equiv="Content-Type" content="text/html; charset=ibm866">

   <meta name="GENERATOR" content="Mozilla/4.72 [koi8-r] (X11; U; Linux 2.2.12-20smp i686) [Netscape]">

   <title>⮢ ࠭ ⠭ Apache</title>

<!--  䮭, 뫪: ᨭ (), 񬭮-䨮⮢ (),  () -->

</head>

<body text="#000000" bgcolor="#FFFFFF" link="#0000FF" vlink="#000080" alink="#FF0000">

᫨   ,  ,  ⠭

 <a href="http://www.apache.org/httpd">-ࢥ Apache</a>  ⮩

⥬ 訫 ᯥ譮.   ⥯  ᮤন  

४    ࠭.

<p>

<hr WIDTH="50%" SIZE="8">

<center>

<h2>

     ࠭?</h2></center>

 ࠭ 室  ⮬,   ⥬ 

䨣 ⮣ -ࢥ. , <b>令  殬, ⢥ᢥ

 প ⮣ ࢥ  ᭥  ᮢ.</b> Apache Software

Foundation,   -ࢥ,    ⮩

⥬,  易  প ⮩ ⥬    &nbsp;

ࠧ ஡ 䨣樨.

<p>

<hr WIDTH="50%" SIZE="8">

<p><a href="manual/index.html">㬥</a>  -ࢥ Apache ਫ

  .

<p>  ᢮ ᯮ짮 ⮣ࠬ, 室 ,  -ࢥ,

ᯮ騬  Apache. ᨡ  ᯮ짮 Apache!

<center><img SRC="apache_pb.gif" ALT="" ></center>



</body>

</html>