You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ma...@locus.apache.org on 2000/04/05 22:13:06 UTC
cvs commit: apache-2.0/conf httpd.conf-dist httpd.conf-dist-win
martin 00/04/05 13:13:05
Modified: conf httpd.conf-dist httpd.conf-dist-win
Added: htdocs index.html.ru.cp866
Removed: htdocs index.html.ru.cp-866
Log:
Fix charset names (see ftp://ftp.isi.edu/in-notes/iana/assignments/character-sets)
and resynchronize unix & win versions
Revision Changes Path
1.1 apache-2.0/htdocs/index.html.ru.cp866
Index: index.html.ru.cp866
===================================================================
<!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, ���� �� ���-�ࢥ�, ����� �������� ����������� �⮩
��⥬�, �� �易� � �����প�� �⮩ ��⥬� � �� ����� ������ ���
ࠧ���� ����� ���䨣��樨.
<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>
1.8 +10 -10 apache-2.0/conf/httpd.conf-dist
Index: httpd.conf-dist
===================================================================
RCS file: /home/cvs/apache-2.0/conf/httpd.conf-dist,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -u -r1.7 -r1.8
--- httpd.conf-dist 2000/04/04 15:41:26 1.7
+++ httpd.conf-dist 2000/04/05 20:13:00 1.8
@@ -712,12 +712,14 @@
# 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-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 @@
# 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
1.5 +59 -4 apache-2.0/conf/httpd.conf-dist-win
Index: httpd.conf-dist-win
===================================================================
RCS file: /home/cvs/apache-2.0/conf/httpd.conf-dist-win,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- httpd.conf-dist-win 2000/03/17 01:14:10 1.4
+++ httpd.conf-dist-win 2000/04/05 20:13:02 1.5
@@ -586,6 +586,7 @@
# 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 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 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 @@
# 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