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:07:08 UTC
svn commit: r290769 - in /apr/apr/branches/0.9.x: CHANGES
locks/win32/proc_mutex.c
Author: wrowe
Date: Wed Sep 21 11:07:06 2005
New Revision: 290769
URL: http://svn.apache.org/viewcvs?rev=290769&view=rev
Log:
Win32: fix apr_proc_mutex_trylock() to handle WAIT_TIMEOUT,
returning APR_EBUSY.
Backport: 290766
Submitted by: Ronen Mizrahi <ronen tversity.com>
Reviewed by: wrowe, Henry Jen
Modified:
apr/apr/branches/0.9.x/CHANGES
apr/apr/branches/0.9.x/locks/win32/proc_mutex.c
Modified: apr/apr/branches/0.9.x/CHANGES
URL: http://svn.apache.org/viewcvs/apr/apr/branches/0.9.x/CHANGES?rev=290769&r1=290768&r2=290769&view=diff
==============================================================================
--- apr/apr/branches/0.9.x/CHANGES (original)
+++ apr/apr/branches/0.9.x/CHANGES Wed Sep 21 11:07:06 2005
@@ -1,5 +1,8 @@
Changes with APR 0.9.7
+ *) Win32: fix apr_proc_mutex_trylock() to handle WAIT_TIMEOUT,
+ returning APR_EBUSY. [Ronen Mizrahi <ro...@tversity.com>]
+
*) Fix apr_file_read() to catch write failures when flushing pending
writes for a buffered file. [Joe Orton]
Modified: apr/apr/branches/0.9.x/locks/win32/proc_mutex.c
URL: http://svn.apache.org/viewcvs/apr/apr/branches/0.9.x/locks/win32/proc_mutex.c?rev=290769&r1=290768&r2=290769&view=diff
==============================================================================
--- apr/apr/branches/0.9.x/locks/win32/proc_mutex.c (original)
+++ apr/apr/branches/0.9.x/locks/win32/proc_mutex.c Wed Sep 21 11:07:06 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();
}