summaryrefslogtreecommitdiff
path: root/locks
diff options
context:
space:
mode:
authorwrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68>2005-09-21 18:05:53 +0000
committerwrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68>2005-09-21 18:05:53 +0000
commit7d11790efd6dbf20b7ea6875e324e08964accb92 (patch)
tree422fd7a1bf42686c37c866859754acd0788a4456 /locks
parent5f855ad53de8ca550512d8f217820e9cef67797b (diff)
downloadlibapr-7d11790efd6dbf20b7ea6875e324e08964accb92.tar.gz
Win32: fix apr_proc_mutex_trylock() to handle WAIT_TIMEOUT,
returning APR_EBUSY. Submitted by: Ronen Mizrahi <ronen tversity.com> Reviewed by: wrowe, Henry Jen git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@290766 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'locks')
-rw-r--r--locks/win32/proc_mutex.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/locks/win32/proc_mutex.c b/locks/win32/proc_mutex.c
index 9e316506a..8a9026e46 100644
--- a/locks/win32/proc_mutex.c
+++ b/locks/win32/proc_mutex.c
@@ -144,6 +144,9 @@ APR_DECLARE(apr_status_t) apr_proc_mutex_trylock(apr_proc_mutex_t *mutex)
if (rv == WAIT_OBJECT_0 || rv == WAIT_ABANDONED) {
return APR_SUCCESS;
+ }
+ else if (rv == WAIT_TIMEOUT) {
+ return APR_EBUSY;
}
return apr_get_os_error();
}