apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From roo...@apache.org
Subject svn commit: r372434 - in /apr/apr/branches/1.2.x: CHANGES file_io/win32/readwrite.c
Date Thu, 26 Jan 2006 04:34:07 GMT
Author: rooneg
Date: Wed Jan 25 20:34:05 2006
New Revision: 372434

URL: http://svn.apache.org/viewcvs?rev=372434&view=rev
Log:
Merge r355790 to 1.2.x.

Original log message:

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/branches/1.2.x/CHANGES
    apr/apr/branches/1.2.x/file_io/win32/readwrite.c

Modified: apr/apr/branches/1.2.x/CHANGES
URL: http://svn.apache.org/viewcvs/apr/apr/branches/1.2.x/CHANGES?rev=372434&r1=372433&r2=372434&view=diff
==============================================================================
--- apr/apr/branches/1.2.x/CHANGES (original)
+++ apr/apr/branches/1.2.x/CHANGES Wed Jan 25 20:34:05 2006
@@ -5,6 +5,9 @@
   *) Fix assertion from double close of a handle with a rwlock on win32.
      [Evgueni Brevnov <evgueni.brevnov gmail.com>]
 
+  *) Fix EOF handling for unbuffered reads on win32.
+     [Konstantin Sharenkov <Konstantin.Sharenkov enterra-inc.com>]
+
   *) Documented that apr_stat and apr_dir_read can return APR_INCOMPLETE,
      and how to determine which parts of the resulting apr_finfo_t can be
      used in such a case.

Modified: apr/apr/branches/1.2.x/file_io/win32/readwrite.c
URL: http://svn.apache.org/viewcvs/apr/apr/branches/1.2.x/file_io/win32/readwrite.c?rev=372434&r1=372433&r2=372434&view=diff
==============================================================================
--- apr/apr/branches/1.2.x/file_io/win32/readwrite.c (original)
+++ apr/apr/branches/1.2.x/file_io/win32/readwrite.c Wed Jan 25 20:34:05 2006
@@ -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;
     }
 



Mime
View raw message