You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by di...@locus.apache.org on 2000/03/17 02:14:12 UTC
cvs commit: apache-2.0/src/include ap_ctype.h
dirkx 00/03/16 17:14:11
Modified: conf httpd.conf-dist httpd.conf-dist-win
src CHANGES
src/include ap_ctype.h
Added: htdocs index.html.et index.html.ja.iso2022-jp
index.html.kr.iso2022-kr index.html.ltz
Removed: htdocs index.html.ee index.html.ja.jis
index.html.kr.iso-kr index.html.lu
index.html.po.iso-pl
Log:
After adding the AddCharset's back in; here is some
minor stuff to make that work and some examples.
Revision Changes Path
1.5 +65 -9 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.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- httpd.conf-dist 2000/03/16 22:05:55 1.4
+++ httpd.conf-dist 2000/03/17 01:14:10 1.5
@@ -630,10 +630,21 @@
AddEncoding x-gzip gz tgz
#
-# AddLanguage allows you to specify the language of a document. You can
-# then use content negotiation to give a browser a file in a language
-# it can understand.
+# DefaultLanguage and AddLanguage allows you to specify the language of
+# a document. You can then use content negotiation to give a browser a
+# file in a language the user can understand.
+#
+# Specify a default langyage. This means that all data
+# going out without a specific language tag (See below) will
+# be marked with this one. You propably do NOT want to set
+# this unless you are sure it is correct for all cases.
+#
+# * It is generally better to not mark a pages as in
+# * being a certain language than marking it with the wrong
+# * language!
#
+# DefaultLanguage nl
+#
# Note 1: The suffix does not have to be the same as the language
# keyword --- those with documents in Polish (whose net-standard
# language code is pl) may wish to use "AddLanguage pl .po" to
@@ -648,7 +659,7 @@
# specifier. But there is 'work in progress' to fix this and get
# the reference data for rfc1766 cleaned up.
#
-# Danish (da) - Dutch (nl) - English (en) - Estonian (ee)
+# Danish (da) - Dutch (nl) - English (en) - Estonian (et)
# French (fr) - German (de) - Greek-Modern (el)
# Italian (it) - Norwegian (no) - Korean (kr)
# Portugese (pt) - Luxembourgeois* (ltz)
@@ -658,21 +669,18 @@
AddLanguage da .dk
AddLanguage nl .nl
AddLanguage en .en
-AddLanguage et .ee
+AddLanguage et .et
AddLanguage fr .fr
AddLanguage de .de
AddLanguage el .el
AddLanguage it .it
AddLanguage ja .ja
-AddCharset ISO-2022-JP .jis
AddLanguage pl .po
AddLanguage kr .kr
-AddCharset ISO-2022-KR .iso-kr
-AddCharset ISO-8859-2 .iso-pl
AddLanguage pt .pt
AddLanguage no .no
AddLanguage pt-br .pt-br
-AddLanguage ltz .lu
+AddLanguage ltz .ltz
AddLanguage ca .ca
AddLanguage es .es
AddLanguage sv .se
@@ -686,7 +694,55 @@
#
LanguagePriority en da nl et fr de el it ja kr no pl pt pt-br 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 standart 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 to always set a default char set.
+#
+AddDefaultCharset ISO-8859-1
+
#
+# Commonly used filename extensions to character sets. You propably
+# want to avoid clashes with the language extensions, unless you
+# are good at carefully testing your setup after each change.
+#
+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-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
+
+# The set below does not map to a specific (iso) standard
+# but works on a fairly wide range of browser. 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 KOI8-r .koi8-ru .ru
+AddCharset KOI8-ru .koi8-uk .ua
+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
# make certain files to be certain types.
#
1.4 +6 -6 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.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- httpd.conf-dist-win 2000/03/16 22:05:56 1.3
+++ httpd.conf-dist-win 2000/03/17 01:14:10 1.4
@@ -580,7 +580,7 @@
# specifier. But there is 'work in progress' to fix this and get
# the reference data for rfc1766 cleaned up.
#
-# Danish (da) - Dutch (nl) - English (en) - Estonian (ee)
+# Danish (da) - Dutch (nl) - English (en) - Estonian (et)
# French (fr) - German (de) - Greek-Modern (el)
# Italian (it) - Norwegian (no) - Korean (kr)
# Portugese (pt) - Luxembourgeois* (ltz)
@@ -590,21 +590,21 @@
AddLanguage da .dk
AddLanguage nl .nl
AddLanguage en .en
-AddLanguage et .ee
+AddLanguage et .et
AddLanguage fr .fr
AddLanguage de .de
AddLanguage el .el
AddLanguage it .it
AddLanguage ja .ja
-AddCharset ISO-2022-JP .jis
+AddCharset ISO-2022-JP .iso2022-jp
AddLanguage pl .po
AddLanguage kr .kr
-AddCharset ISO-2022-KR .iso-kr
-AddCharset ISO-8859-2 .iso-pl
+AddCharset ISO-2022-KR .iso2022-kr
+AddCharset ISO-8859-2 .iso8859-pl
AddLanguage pt .pt
AddLanguage no .no
AddLanguage pt-br .pt-br
-AddLanguage ltz .lu
+AddLanguage ltz .ltz
AddLanguage ca .ca
AddLanguage es .es
AddLanguage sv .se
1.1 apache-2.0/htdocs/index.html.et
Index: index.html.et
===================================================================
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<HTML>
<HEAD>
<TITLE>Apache veebiserveri installatsiooni testlehekülg</TITLE>
<!-- Original translation: Ahti Heinla, ahti@ahti.bluemoon.ee, Thu Aug 19 12:57:48 GMT 1999 -->
</HEAD>
<!-- Background white, links blue (unvisited), navy (visited), red (active) -->
<BODY
BGCOLOR="#FFFFFF"
TEXT="#000000"
LINK="#0000FF"
VLINK="#000080"
ALINK="#FF0000"
>
<H1 ALIGN="CENTER">
Kujuta pilti, käima läks! Apache veebiserver on installeeritud!
</H1>
<P>
Kui Sa näed seda lehekülge, siis selle domeeni omanikud on
edukalt hakkama saanud <A HREF="http://www.apache.org/httpd">Apache veebiserveri</A>
installeerimisega. Järgmiseks peaks nad selle lehekülje asendama
misiganes materjaliga, mida nad oma veebisaidis näidata tahavad,
või siis juhatama veebiserverile kätte tegeliku materjali
asukoha.
</P>
<HR>
<BLOCKQUOTE>
Kui Sa ootasid siin leheküljel näha hoopis midagi muud,
siis palun <STRONG>võta ühendust selle veebisaidi
administraatoriga.</STRONG> (Võid näiteks kirjutada aadressil
<SAMP><Webmaster@<EM>domain</EM>></SAMP>.) Kuigi see veebisait
kasutab Apache tarkvara, pole ta peaaegu kindlasti mitte Apache Group'iga
mingil muul moel seotud. Seega, palun ära kirjuta selle saidi
asjus Apache autoritele. Kui sa seda teed, siis sinu kirja
<STRONG><BIG>ignoreeritakse</BIG></STRONG>.
</BLOCKQUOTE>
<HR>
<P>
Ka Apache
<A
HREF="manual/index.html"
>dokumentatsioon</A>
on selles distributsioonis olemas.
</P>
<P>
Kohalik veebmeister võib vabalt kasutada allpool olevat
pilti oma Apache veebiserveril. Aitäh Apachet kasutamast!
</P>
<DIV ALIGN="CENTER">
<IMG SRC="apache_pb.gif" ALT="">
</DIV>
</BODY>
</HTML>
1.1 apache-2.0/htdocs/index.html.ja.iso2022-jp
Index: index.html.ja.iso2022-jp
===================================================================
<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN"
"http://www.w3.org/TR/REC-html40/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-2022-JP">
<title>Apache $B%$%s%9%H!<%k;~$N%F%9%H%Z!<%8(B</title>
</head>
<!-- Background white, links blue (unvisited), navy (visited), red (active) -->
<body
bgcolor="#ffffff"
text="#000000"
link="#0000ff"
vlink="#000080"
alink="#ff0000"
>
<p>
$B$b$7$3$N%Z!<%8$,FI$a$?$N$G$"$l$P!"(B<a href="http://www.apache.org/httpd">Apache $B%&%'%V%5!<%P(B</a>$B$N%$%s%9%H!<%k$,$3$N7W;;5!$GL5;v$K=*N;$7$?$3$H$r0UL#$7$^$9!#$"$J$?$O!"$3$N%G%#%l%/%H%j$KJ8=q$r2C$($?$j!"$3$N%Z!<%8$rCV$-$+$($k$3$H$,$G$-$^$9!#(B
</p>
<hr width="50%" size="8">
<h2 align="center">$B$"$J$?$NM=A[$KH?$7$F!"$3$N%Z!<%8$,8+$($F$$$k$G$7$g$&$+(B?</h2>
<p>
$B$3$N%Z!<%8$O!"%5%$%H4IM}<T$,$3$N(B web $B%5!<%P$N@_Dj$rJQ99$7$?$?$a$K8+$($F$$$^$9!#(B
<strong>$B$3$N%5!<%P$r4IM}$9$k@UG$$r;}$C$F$$$kJ}$KO"Mm$r$H$C$F(B</strong>$B$/$@$5$$!#$3$N%5%$%H4IM}<T$,MxMQ$7$F$$$k(B web $B%5!<%P$r3+H/$7$?(B The Apache Software Foundation $B$O!"$3$N%5%$%H$N(B web $B%5!<%P$N4IM}$H$O4X78$,$J$/!"%5!<%P$N@_Dj$K4X$9$kLdBj$r2r7h$9$k$3$H$O$G$-$^$;$s!#(B
</p>
<hr width="50%" size="8">
<p>
Apache $B$K4X$9$k(B<A HREF="manual/index.html">$BJ8=q(B</A> $B$O!"$3$N(B web $B%5!<%PG[I[J*$NCf$K4^$^$l$F$$$^$9!#(B
</p>
<p>
$B0J2<$N2hA|$O!"(BApache $B$rMxMQ$7$F$$$k(B web $B%5!<%P$G<+M3$K;H$&$3$H$,$G$-$^$9!#(BApache $B$r$4MxMQ$$$?$@$-!"$"$j$,$H$&$4$6$$$^$9(B!
</p>
<div align="center">
<img src="apache_pb.gif" alt="">
</div>
</body>
</html>
1.1 apache-2.0/htdocs/index.html.kr.iso2022-kr
Index: index.html.kr.iso2022-kr
===================================================================
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//KR">
<HTML>
<HEAD>
<META http-equiv="Content-Type" content="text/html; charset=eucKR">
<TITLE>����ġ ��ġ�� ���� ��Ʈ������</TITLE>
</HEAD>
<!-- Background white, links blue (unvisited), navy (visited), red (active) -->
<BODY
BGCOLOR="#FFFFFF"
TEXT="#000000"
LINK="#0000FF"
VLINK="#000080"
ALINK="#FF0000"
>
<P>
����ȭ���� �� ���̽Ŵٸ� �� �ý��ۿ� <A HREF="http://www.apache.org/httpd">Apache ������</A> ����Ʈ������ ��ġ�� ���������� �����ٴ°� �ǹ��մϴ�. �������� �Ƹ� �� �� �������� ����� ���丮�� ���ο� ������ �߰��� ���Դϴ�.
<P><HR WIDTH="50%" SIZE="8">
<H2 ALIGN="CENTER">�������� ������ ������Ʈ ��� �� ȭ���� ���Դϱ�?</H2>
<P>
����Ʈ �����ڰ� �� ������ ���������� �����߱� ������ �� �������� ���̴� �� �Դϴ�.
<STRONG>���������� �� �������� å���ڿ��� �����Ͻñ� �ٶ��ϴ�.</STRONG> Apache Software Foundation�� �� ����Ʈ�� �����ڰ� ������� �������� ���� ��ü
�� �� ����Ʈ�� ��������̳� ���������� ���� ������ �帱 �� �����ϴ�.
<P><HR WIDTH="50%" SIZE="8">
<P>
����ġ <A HREF="manual/index.html">����</A>�� �� �����ǿ� ���ԵǾ� �ֽ��ϴ�.
<P>
�Ʒ��� �ִ� Apache �̹����� ����ϴ°� �������� �����Դϴ�. ����ġ�� ����� �ּż� �����մϴ�!
<DIV ALIGN="CENTER"><IMG SRC="apache_pb.gif" ALT=""></DIV>
</BODY>
</HTML>
1.1 apache-2.0/htdocs/index.html.ltz
Index: index.html.ltz
===================================================================
<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<!-- Originally translated by Jean-Luc Widlowski, jean-luc.widlowski@jrc.it Thu Aug 19 13:00:18 GMT 1999 -->
<title>Test Page for Apache Installation on Web Site</title>
<!-- Background white, links blue (unvisited), navy (visited), red (active) -->
</head>
<body text="#000000" bgcolor="#FFFFFF" link="#0000FF" vlink="#000080" alink="#FF0000">
<center>
<h1>
Et huet geklappt! Den Apache Web Server as op dëser 'Web Site' installeiert!</h1></center>
Wann Dir die heiten Sait gesit, dann hun d'Proprietairen vun dëser 'domain'
elo just d'<a href="http://www.apache.org/httpd">Apache Web server</a> software
mat succés installeiert. Sie mussen allerdengs nach des Decksait
remplaceieren oder awer de Server op eng aner Sait mat dem richtigen contenu
em-dirigeieren.
<br>
<hr>
<blockquote>Wann Dir die heiten Sait anstell vun der site die Dir erwârt
hut gesitt, da contacteiert wannechglift den <b>administrator vun dem betraffener
site.</b> (Versicht én email no <tt><Webmaster@<i>domain</i>> </tt><font face="Times New Roman,Times">ze
schecken.) Obwuel den heiten site </font>Apache software benotzt, as et
ball secher datt keng Verbindung mat der Apache Group existeiert, also scheckt
wannechglift keng email iwert desen site oder sein contenu zu den Apache
Autoren. Falls Dir dëst awer macht, get ären message <b><font size=+2>ignoreiert.</font></b></blockquote>
<hr>
<p>D'Apache <a href="manual/index.html">documentation</a> ass dëser Ausgab
beigefücht.
<p>Dem Webmaster vun dem heitenen site steht et zou dest Bild ob engem
Apache-powered Web server ze presenteieren. Merci dat Dir Apache benotzt!
<center><img SRC="apache_pb.gif" ALT="" ></center>
</body>
</html>
1.30 +5 -1 apache-2.0/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-2.0/src/CHANGES,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -u -r1.29 -r1.30
--- CHANGES 2000/03/16 22:05:56 1.29
+++ CHANGES 2000/03/17 01:14:11 1.30
@@ -1,7 +1,11 @@
Changes with Apache 2.0a2-dev
*) Put in Korean and Norwegian index.html pages (2.0 and 1.3)
- which where donated by Lee Kuk Hyun and Lorant Czaran [dirkx].
+ which where donated by Lee Kuk Hyun and Lorant Czaran. 'Fixed'
+ confusing ee/et name and made all extensions language/dialect
+ rather than country reflecting. Changed example files to
+ explicit reflect the ISO charset and added a few common
+ ones to the example config [dirkx]
*) Extend external module capability. To use this, you call
configure with --with-module=path/to/mod1,path/to/mod2,etc.
1.3 +1 -0 apache-2.0/src/include/ap_ctype.h
Index: ap_ctype.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/ap_ctype.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- ap_ctype.h 2000/03/10 00:05:50 1.2
+++ ap_ctype.h 2000/03/17 01:14:11 1.3
@@ -75,6 +75,7 @@
#define ap_isdigit(c) (isdigit(((unsigned char)(c))))
#define ap_isgraph(c) (isgraph(((unsigned char)(c))))
#define ap_islower(c) (islower(((unsigned char)(c))))
+#define ap_isascii(c) (isascii(((unsigned char)(c))))
#define ap_isprint(c) (isprint(((unsigned char)(c))))
#define ap_ispunct(c) (ispunct(((unsigned char)(c))))
#define ap_isspace(c) (isspace(((unsigned char)(c))))
Re: cvs commit: apache-2.0/src/include ap_ctype.h
Posted by Marc Slemko <ma...@znep.com>.
On 17 Mar 2000 dirkx@locus.apache.org wrote:
> +
> +# 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 standart 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 to always set a default char set.
> +#
> +AddDefaultCharset ISO-8859-1
Eck. No no.
This is a major problem because it overrides any charsets specified
in a meta tag in the document. This means it magically breaks a lot
of sites and results in the normal situation being one in which users
can not do anything to get the proper charset in their pages, since they
can't alter the config file and they can't override it with a meta tag.
I do _NOT_ think this is appropriate to enable by default and had never
even thought about that being done when I wrote it.
BTW, I note that in 2.0 it seems that if I get "/" on a server without
sending any accept-language, then I get an directory index. That isn't
good... It could just be the system I'm trying it on, which has a few other
2.0 bogons.