summaryrefslogtreecommitdiff
path: root/xlate
diff options
context:
space:
mode:
authorgregames <gregames@13f79535-47bb-0310-9956-ffa450edef68>2011-07-22 18:44:37 +0000
committergregames <gregames@13f79535-47bb-0310-9956-ffa450edef68>2011-07-22 18:44:37 +0000
commit50663a155862d939ee4ed2eb61516652cead630f (patch)
tree39511446f46c03522d1c7440fc896e0add497bcf /xlate
parentf2171165b41722909c9cb37bbeafee4d1b8ef376 (diff)
downloadlibapr-50663a155862d939ee4ed2eb61516652cead630f.tar.gz
z/OS iconv uses ISO charset names with only one dash, e.g. ISO8859-1
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@1149692 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'xlate')
-rw-r--r--xlate/xlate.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/xlate/xlate.c b/xlate/xlate.c
index ab1c5f508..6a84c3144 100644
--- a/xlate/xlate.c
+++ b/xlate/xlate.c
@@ -69,6 +69,11 @@ static const char *handle_special_names(const char *page, apr_pool_t *pool)
else if (page == APR_LOCALE_CHARSET) {
return apr_os_locale_encoding(pool);
}
+#ifdef __MVS__
+ else if (!strcasecmp(page, "ISO-8859-1")) {
+ return "ISO8859-1"; /* z/OS ASCII name has no dash after ISO */
+ }
+#endif
else {
return page;
}