APRize WAIT_TIMEOUT before return from apr_sendfile()

git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@61582 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 10 insertions, 3 deletions

diff --git a/network_io/win32/sendrecv.c b/network_io/win32/sendrecv.c
index 8f26e07c4..812475d63 100644
--- a/network_io/win32/sendrecv.c
+++ b/network_io/win32/sendrecv.c
@@ -332,9 +332,16 @@ APR_DECLARE(apr_status_t) apr_sendfile(apr_socket_t *sock, apr_file_t *file,
                 if (rv == WAIT_OBJECT_0)
                     status = APR_SUCCESS;
                 else if (rv == WAIT_TIMEOUT)
-                    status = WAIT_TIMEOUT;
-                else if (rv == WAIT_ABANDONED)
-                    status = WAIT_ABANDONED;
+                    status = APR_FROM_OS_ERROR(WAIT_TIMEOUT);
+                else if (rv == WAIT_ABANDONED) {
+                    /* Hummm... WAIT_ABANDONDED is not an error code. It is
+                     * a return specific to the Win32 WAIT functions that
+                     * indicates that a thread exited while holding a
+                     * mutex. Should consider triggering an assert
+                     * to detect the condition...
+                     */
+                    status = APR_FROM_OS_ERROR(WAIT_TIMEOUT);
+                }
                 else
                     status = apr_get_os_error();
             }