From commits-return-8018-apmail-apr-commits-archive=apr.apache.org@apr.apache.org Fri Nov 10 19:47:54 2006 Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 20442 invoked from network); 10 Nov 2006 19:47:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 10 Nov 2006 19:47:53 -0000 Received: (qmail 96086 invoked by uid 500); 10 Nov 2006 19:48:04 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 95995 invoked by uid 500); 10 Nov 2006 19:48:04 -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 95982 invoked by uid 99); 10 Nov 2006 19:48:04 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Nov 2006 11:48:04 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Nov 2006 11:47:52 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 4EC631A984D; Fri, 10 Nov 2006 11:47:24 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r473450 - in /apr/apr-iconv/branches/0.9.x: CHANGES ces/iso-10646-ucs-2.c Date: Fri, 10 Nov 2006 19:47:24 -0000 To: commits@apr.apache.org From: wrowe@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061110194724.4EC631A984D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: wrowe Date: Fri Nov 10 11:47:23 2006 New Revision: 473450 URL: http://svn.apache.org/viewvc?view=rev&rev=473450 Log: Correct from_ucs zero width joiner/byte order mark, to be injected only at the *start* of stream (when state is still 0). PR: 24387 Submitted by: Kohn Emil Dan Backport: 473449 Modified: apr/apr-iconv/branches/0.9.x/CHANGES apr/apr-iconv/branches/0.9.x/ces/iso-10646-ucs-2.c Modified: apr/apr-iconv/branches/0.9.x/CHANGES URL: http://svn.apache.org/viewvc/apr/apr-iconv/branches/0.9.x/CHANGES?view=diff&rev=473450&r1=473449&r2=473450 ============================================================================== --- apr/apr-iconv/branches/0.9.x/CHANGES (original) +++ apr/apr-iconv/branches/0.9.x/CHANGES Fri Nov 10 11:47:23 2006 @@ -1,6 +1,8 @@ Changes with APR-ICONV 0.9.8-dev - + *) Correct from_ucs zero width joiner/byte order mark to be injected + only at the *start* of stream (when state is still 0). + PR 24387 [Kohn Emil Dan ] Changes with APR-ICONV 0.9.7 Modified: apr/apr-iconv/branches/0.9.x/ces/iso-10646-ucs-2.c URL: http://svn.apache.org/viewvc/apr/apr-iconv/branches/0.9.x/ces/iso-10646-ucs-2.c?view=diff&rev=473450&r1=473449&r2=473450 ============================================================================== --- apr/apr-iconv/branches/0.9.x/ces/iso-10646-ucs-2.c (original) +++ apr/apr-iconv/branches/0.9.x/ces/iso-10646-ucs-2.c Fri Nov 10 11:47:23 2006 @@ -59,7 +59,7 @@ bytes = *state ? 2 : 4; if (*outbytesleft < bytes) return 0; /* No space in the output buffer */ - if (*state) { + if (*state == 0) { *(*outbuf)++ = 0xFE; *(*outbuf)++ = 0xFF; *state = 1;