Return-Path: X-Original-To: apmail-apr-commits-archive@www.apache.org Delivered-To: apmail-apr-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B5B007DD9 for ; Fri, 22 Jul 2011 18:45:00 +0000 (UTC) Received: (qmail 13994 invoked by uid 500); 22 Jul 2011 18:45:00 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 13920 invoked by uid 500); 22 Jul 2011 18:44:59 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 13912 invoked by uid 99); 22 Jul 2011 18:44:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Jul 2011 18:44:59 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Jul 2011 18:44:58 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 42CDB2388906 for ; Fri, 22 Jul 2011 18:44:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1149692 - /apr/apr/trunk/xlate/xlate.c Date: Fri, 22 Jul 2011 18:44:38 -0000 To: commits@apr.apache.org From: gregames@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110722184438.42CDB2388906@eris.apache.org> Author: gregames Date: Fri Jul 22 18:44:37 2011 New Revision: 1149692 URL: http://svn.apache.org/viewvc?rev=1149692&view=rev Log: z/OS iconv uses ISO charset names with only one dash, e.g. ISO8859-1 Modified: apr/apr/trunk/xlate/xlate.c Modified: apr/apr/trunk/xlate/xlate.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/xlate/xlate.c?rev=1149692&r1=1149691&r2=1149692&view=diff ============================================================================== --- apr/apr/trunk/xlate/xlate.c (original) +++ apr/apr/trunk/xlate/xlate.c Fri Jul 22 18:44:37 2011 @@ -69,6 +69,11 @@ static const char *handle_special_names( 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; }