You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2005/09/21 20:05:55 UTC
svn commit: r290766 - in /apr/apr/trunk: CHANGES locks/win32/proc_mutex.c
Author: wrowe
Date: Wed Sep 21 11:05:53 2005
New Revision: 290766
URL: http://svn.apache.org/viewcvs?rev=290766&view=rev
Log:
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
Modified:
apr/apr/trunk/CHANGES
apr/apr/trunk/locks/win32/proc_mutex.c
Modified: apr/apr/trunk/CHANGES
URL: http://svn.apache.org/viewcvs/apr/apr/trunk/CHANGES?rev=290766&r1=290765&r2=290766&view=diff
==============================================================================
--- apr/apr/trunk/CHANGES (original)
+++ apr/apr/trunk/CHANGES Wed Sep 21 11:05:53 2005
@@ -26,6 +26,9 @@
Changes for APR 1.2.2
+ *) Win32: fix apr_proc_mutex_trylock() to handle WAIT_TIMEOUT,
+ returning APR_EBUSY. [Ronen Mizrahi <ro...@tversity.com>]
+
*) Fix apr_socket_opt_set() issue where TCP_NODELAY would be
set when TCP_DEFER_ACCEPT was set. [Brian Pane]
Modified: apr/apr/trunk/locks/win32/proc_mutex.c
URL: http://svn.apache.org/viewcvs/apr/apr/trunk/locks/win32/proc_mutex.c?rev=290766&r1=290765&r2=290766&view=diff
==============================================================================
--- apr/apr/trunk/locks/win32/proc_mutex.c (original)
+++ apr/apr/trunk/locks/win32/proc_mutex.c Wed Sep 21 11:05:53 2005
@@ -144,6 +144,9 @@
if (rv == WAIT_OBJECT_0 || rv == WAIT_ABANDONED) {
return APR_SUCCESS;
+ }
+ else if (rv == WAIT_TIMEOUT) {
+ return APR_EBUSY;
}
return apr_get_os_error();
}