apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r571731 - /apr/apr/branches/0.9.x/file_io/win32/readwrite.c
Date Sat, 01 Sep 2007 07:27:07 GMT
Author: wrowe
Date: Sat Sep  1 00:27:07 2007
New Revision: 571731

URL: http://svn.apache.org/viewvc?rev=571731&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 <steven.naim googlemail.com>
Backports: r571728

Modified:
    apr/apr/branches/0.9.x/file_io/win32/readwrite.c

Modified: apr/apr/branches/0.9.x/file_io/win32/readwrite.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/0.9.x/file_io/win32/readwrite.c?rev=571731&r1=571730&r2=571731&view=diff
==============================================================================
--- apr/apr/branches/0.9.x/file_io/win32/readwrite.c (original)
+++ apr/apr/branches/0.9.x/file_io/win32/readwrite.c Sat Sep  1 00:27:07 2007
@@ -111,6 +111,9 @@
         else 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;
         }
     } else {
         /* OK and 0 bytes read ==> end of file */



Mime
View raw message