summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam A. Rowe Jr <wrowe@apache.org>2006-03-23 21:51:11 +0000
committerWilliam A. Rowe Jr <wrowe@apache.org>2006-03-23 21:51:11 +0000
commitd56099a3e3b4439c21d0b8dc356ce5030cedd8a5 (patch)
tree6fe8ad1e7dd0ea563090da855486c9ad36ed9256
parentc49a6a3e0423bd1c11fe74f1780988b5c5612c26 (diff)
downloadapr-d56099a3e3b4439c21d0b8dc356ce5030cedd8a5.tar.gz
Part 2 of the necessary read_with_timeout() fixes. Catch the
condition where our broken pipe occurs durring the deferred i/o completion phase. git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@388282 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--file_io/win32/readwrite.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/file_io/win32/readwrite.c b/file_io/win32/readwrite.c
index bdcc32164..7b3553529 100644
--- a/file_io/win32/readwrite.c
+++ b/file_io/win32/readwrite.c
@@ -113,7 +113,7 @@ static apr_status_t read_with_timeout(apr_file_t *file, void *buf, apr_size_t le
}
}
}
- else if (rv == APR_FROM_OS_ERROR(ERROR_BROKEN_PIPE)) {
+ if (rv == APR_FROM_OS_ERROR(ERROR_BROKEN_PIPE)) {
/* Assume ERROR_BROKEN_PIPE signals an EOF reading from a pipe */
rv = APR_EOF;
}