You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by st...@apache.org on 2001/05/02 22:00:00 UTC
cvs commit: apr/network_io/win32 sendrecv.c
stoddard 01/05/02 12:59:59
Modified: network_io/win32 sendrecv.c
Log:
APRize WAIT_TIMEOUT before return from apr_sendfile()
Revision Changes Path
1.38 +10 -3 apr/network_io/win32/sendrecv.c
Index: sendrecv.c
===================================================================
RCS file: /home/cvs/apr/network_io/win32/sendrecv.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sendrecv.c 2001/04/02 23:58:37 1.37
+++ sendrecv.c 2001/05/02 19:59:54 1.38
@@ -332,9 +332,16 @@
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();
}