From commits-return-8607-apmail-apr-commits-archive=apr.apache.org@apr.apache.org Sat Sep 01 07:26:56 2007 Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 91449 invoked from network); 1 Sep 2007 07:26:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 1 Sep 2007 07:26:54 -0000 Received: (qmail 52856 invoked by uid 500); 1 Sep 2007 07:26:49 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 52813 invoked by uid 500); 1 Sep 2007 07:26:49 -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 52802 invoked by uid 99); 1 Sep 2007 07:26:49 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Sep 2007 00:26:49 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED 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; Sat, 01 Sep 2007 07:26:42 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7A91C1A9832; Sat, 1 Sep 2007 00:26:22 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r571728 - /apr/apr/trunk/file_io/win32/readwrite.c Date: Sat, 01 Sep 2007 07:26:22 -0000 To: commits@apr.apache.org From: wrowe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070901072622.7A91C1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: wrowe Date: Sat Sep 1 00:26:19 2007 New Revision: 571728 URL: http://svn.apache.org/viewvc?rev=571728&view=rev Log: Correctly handle completion-based read-to-EOF case. Resolves testfile, still have testpipe and testproc to contend with. Submitted by: Steven Naim Modified: apr/apr/trunk/file_io/win32/readwrite.c Modified: apr/apr/trunk/file_io/win32/readwrite.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/file_io/win32/readwrite.c?rev=571728&r1=571727&r2=571728&view=diff ============================================================================== --- apr/apr/trunk/file_io/win32/readwrite.c (original) +++ apr/apr/trunk/file_io/win32/readwrite.c Sat Sep 1 00:26:19 2007 @@ -122,6 +122,9 @@ if (rv == APR_FROM_OS_ERROR(ERROR_BROKEN_PIPE)) { /* Assume ERROR_BROKEN_PIPE signals an EOF reading from a pipe */ rv = APR_EOF; + } else if (rv == APR_FROM_OS_ERROR(ERROR_HANDLE_EOF)) { + /* Did we hit EOF reading from the handle? */ + rv = APR_EOF; } }