backport r654185

git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.3.x@654186 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 1 insertions, 2 deletions

diff --git a/CHANGES b/CHANGES
index 5acf3401d..5bade2ec0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -47,7 +47,7 @@ Changes for APR 1.3.0
      allocation.  [David Jones <oscaremma gmail.com>]
 
   *) Implement Darwin-semantic (9.0.0 and later) sendfile support.
-     [William Rowe]
+     [William Rowe, Jim Jagielski]
 
   *) Implemented the APR_FOPEN_SPARSE flag, permits win32 to create
      sparse data files.  Also bestow apr_fileinfo_t csize field for
diff --git a/network_io/unix/sendrecv.c b/network_io/unix/sendrecv.c
index 2362b215e..ab7eba79c 100644
--- a/network_io/unix/sendrecv.c
+++ b/network_io/unix/sendrecv.c
@@ -472,7 +472,6 @@ apr_status_t apr_socket_sendfile(apr_socket_t * sock, apr_file_t * file,
                 if (errno == EAGAIN) {
                     if (sock->timeout > 0) {
                         sock->options |= APR_INCOMPLETE_WRITE;
-                        rv = 0;
                     }
                     /* BSD's sendfile can return -1/EAGAIN even if it
                      * sent bytes.  Sanitize the result so we get normal EAGAIN