language code for Czech is 'cs', not 'cz'.

PR: 9427
Reviewed by: Jeff Trawick, Bill Stoddard

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@99810 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/conf/httpd.conf-dist b/conf/httpd.conf-dist
index 7b154e414b3e2a14f648aa1d8116f16c7a111faa..d26eb45d99038366dbcda77ed870162418b42b51 100644 (file)
--- a/conf/httpd.conf-dist
+++ b/conf/httpd.conf-dist
@@ -710,7 +710,7 @@ ServerSignature On
     # French (fr) - German (de) - Greek-Modern (el)
     # Italian (it) - Korean (kr) - Norwegian (no) - Norwegian Nynorsk (nn)
     # Portugese (pt) - Luxembourgeois* (ltz)
-    # Spanish (es) - Swedish (sv) - Catalan (ca) - Czech(cz)
+    # Spanish (es) - Swedish (sv) - Catalan (ca) - Czech(cs)
     # Polish (pl) - Brazilian Portuguese (pt-br) - Japanese (ja)
     # Russian (ru)
     #
@@ -738,7 +738,7 @@ ServerSignature On
     AddLanguage ca .ca
     AddLanguage es .es
     AddLanguage sv .sv
-    AddLanguage cz .cz
+    AddLanguage cs .cz .cs
     AddLanguage ru .ru
     AddLanguage zh-TW .zh-tw
     AddCharset Big5         .Big5    .big5

diff --git a/conf/httpd.conf-dist-nw b/conf/httpd.conf-dist-nw
index 9079ae72f2f72ef2b1f743ce119ef499210e0b3d..cd4f4ec5844054cb30f08d02f6f5bd46bb5f0879 100644 (file)
--- a/conf/httpd.conf-dist-nw
+++ b/conf/httpd.conf-dist-nw
@@ -655,7 +655,7 @@ ServerSignature On
     # French (fr) - German (de) - Greek-Modern (el)
     # Italian (it) - Korean (kr) - Norwegian (no) - Norwegian Nynorsk (nn)
     # Portugese (pt) - Luxembourgeois* (ltz)
-    # Spanish (es) - Swedish (sv) - Catalan (ca) - Czech(cz)
+    # Spanish (es) - Swedish (sv) - Catalan (ca) - Czech(cs)
     # Polish (pl) - Brazilian Portuguese (pt-br) - Japanese (ja)
     # Russian (ru)
     #
@@ -683,7 +683,7 @@ ServerSignature On
     AddLanguage ca .ca
     AddLanguage es .es
     AddLanguage sv .sv
-    AddLanguage cz .cz
+    AddLanguage cs .cz .cs
     AddLanguage ru .ru
     AddLanguage zh-TW .zh-tw
     AddCharset Big5         .Big5    .big5

diff --git a/conf/httpd.conf-dist-win b/conf/httpd.conf-dist-win
index cf31564a9a78a844c3772a7bfe0187437adb815e..a5ae9317559ba1887fd8c2a2be038d5130f08b7f 100644 (file)
--- a/conf/httpd.conf-dist-win
+++ b/conf/httpd.conf-dist-win
@@ -755,7 +755,7 @@ ServerSignature On
     # French (fr) - German (de) - Greek-Modern (el)
     # Italian (it) - Korean (kr) - Norwegian (no) - Norwegian Nynorsk (nn)
     # Portugese (pt) - Luxembourgeois* (ltz)
-    # Spanish (es) - Swedish (sv) - Catalan (ca) - Czech(cz)
+    # Spanish (es) - Swedish (sv) - Catalan (ca) - Czech(cs)
     # Polish (pl) - Brazilian Portuguese (pt-br) - Japanese (ja)
     # Russian (ru)
     #
@@ -783,7 +783,7 @@ ServerSignature On
     AddLanguage ca .ca
     AddLanguage es .es
     AddLanguage sv .sv
-    AddLanguage cz .cz
+    AddLanguage cs .cz .cs
     AddLanguage ru .ru
     AddLanguage zh-TW .zh-tw
     AddCharset Big5         .Big5    .big5

diff --git a/src/CHANGES b/src/CHANGES
index 6f30080d5493118228d8a2083eb3443a674341c6..6be328e142b1d4bbcf2684b7c99a0bb6136b7adb 100644 (file)
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 1.3.28
 
+  *) Use appropriate language code for Czech (cs) and Traditional Chinese
+     (zh-tw) in default config files. PR 9427.  [André Malo]
+
   *) Don't block synchronous signals (e.g., SIGSEGV) while waiting for
      and holding a pthread accept mutex.  [Jeff Trawick]