summaryrefslogtreecommitdiff
path: root/file_io
diff options
context:
space:
mode:
authorbjh <bjh@13f79535-47bb-0310-9956-ffa450edef68>2004-05-22 07:04:34 +0000
committerbjh <bjh@13f79535-47bb-0310-9956-ffa450edef68>2004-05-22 07:04:34 +0000
commit791c0c6d88857214215c8f67fb9e19bf02584195 (patch)
tree74b8b97693c2e67d5647cfd599a4c8868a4eccb7 /file_io
parent2f1ef7e7c30c40ffb0de78ce8579e6762f6a7cbe (diff)
downloadlibapr-791c0c6d88857214215c8f67fb9e19bf02584195.tar.gz
OS/2: Fix incorrect return of APR_EOF when a 0 length read is requested
Found while porting subversion. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/APR_0_9_BRANCH@65110 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'file_io')
-rw-r--r--file_io/os2/readwrite.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/file_io/os2/readwrite.c b/file_io/os2/readwrite.c
index 65fee7854..38855b035 100644
--- a/file_io/os2/readwrite.c
+++ b/file_io/os2/readwrite.c
@@ -74,7 +74,7 @@ APR_DECLARE(apr_status_t) apr_file_read(apr_file_t *thefile, void *buf, apr_size
*nbytes = rc == 0 ? pos - (char *)buf : 0;
apr_thread_mutex_unlock(thefile->mutex);
- if (*nbytes == 0 && rc == 0) {
+ if (*nbytes == 0 && rc == 0 && thefile->eof_hit) {
return APR_EOF;
}