Return-Path: 
 <commits-return-7210-apmail-apr-commits-archive=apr.apache.org@apr.apache.org>
Delivered-To: apmail-apr-commits-archive@www.apache.org
Received: (qmail 24957 invoked from network); 10 Dec 2005 22:22:42 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 10 Dec 2005 22:22:42 -0000
Received: (qmail 68653 invoked by uid 500); 10 Dec 2005 22:22:41 -0000
Delivered-To: apmail-apr-commits-archive@apr.apache.org
Received: (qmail 68620 invoked by uid 500); 10 Dec 2005 22:22:40 -0000
Mailing-List: contact commits-help@apr.apache.org; run by ezmlm
Precedence: bulk
List-Post: <mailto:commits@apr.apache.org>
List-Help: <mailto:commits-help@apr.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@apr.apache.org>
Reply-To: dev@apr.apache.org
List-Id: <commits.apr.apache.org>
Delivered-To: mailing list commits@apr.apache.org
Received: (qmail 68609 invoked by uid 99); 10 Dec 2005 22:22:40 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 Dec 2005 14:22:40 -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 [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Sat, 10 Dec 2005 14:22:39 -0800
Received: (qmail 24853 invoked by uid 65534); 10 Dec 2005 22:22:19 -0000
Message-ID: <20051210222219.24851.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r355790 - in /apr/apr/trunk: CHANGES
 file_io/win32/readwrite.c
Date: Sat, 10 Dec 2005 22:22:18 -0000
To: commits@apr.apache.org
From: rooneg@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: rooneg
Date: Sat Dec 10 14:22:12 2005
New Revision: 355790

URL: http://svn.apache.org/viewcvs?rev=355790&view=rev
Log:
Fix handling of EOF for unbuffered reads on win32.

* file_io/win32/readwrite.c
  (apr_file_read): In the unbuffered case, set thefile->eof_true if we
   hit EOF.

* CHANGES: note Change.

Submitted by: Konstantin Sharenkov <Konstantin.Sharenkov at enterra-inc.com>
Reviewed by: wrowe, rooneg

Modified:
    apr/apr/trunk/CHANGES
    apr/apr/trunk/file_io/win32/readwrite.c

Modified: apr/apr/trunk/CHANGES
URL: http://svn.apache.org/viewcvs/apr/apr/trunk/CHANGES?rev=355790&r1=355789&r2=355790&view=diff
==============================================================================
--- apr/apr/trunk/CHANGES (original)
+++ apr/apr/trunk/CHANGES Sat Dec 10 14:22:12 2005
@@ -2,7 +2,10 @@
 
   *) Only include uuid/uuid.h if we haven't already included uuid.h, since
      doing so can result in type conflicts.
-     [Craig Rodrigues <rodrigc at crodrigues.org>]
+     [Craig Rodrigues <rodrigc crodrigues.org>]
+
+  *) Fix EOF handling for unbuffered reads on win32.
+     [Konstantin Sharenkov <Konstantin.Sharenkov enterra-inc.com>]
 
 Changes for APR 1.3.0
 

Modified: apr/apr/trunk/file_io/win32/readwrite.c
URL: http://svn.apache.org/viewcvs/apr/apr/trunk/file_io/win32/readwrite.c?rev=355790&r1=355789&r2=355790&view=diff
==============================================================================
--- apr/apr/trunk/file_io/win32/readwrite.c (original)
+++ apr/apr/trunk/file_io/win32/readwrite.c Sat Dec 10 14:22:12 2005
@@ -206,6 +206,8 @@
         /* Unbuffered i/o */
         apr_size_t nbytes;
         rv = read_with_timeout(thefile, buf, *len, &nbytes);
+        if (rv == APR_EOF)
+            thefile->eof_hit = TRUE;
         *len = nbytes;
     }