diff options
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | locks/win32/proc_mutex.c | 3 |
2 files changed, 6 insertions, 0 deletions
@@ -26,6 +26,9 @@ Changes for APR 1.3.0 Changes for APR 1.2.2 + *) Win32: fix apr_proc_mutex_trylock() to handle WAIT_TIMEOUT, + returning APR_EBUSY. [Ronen Mizrahi <ronen@tversity.com>] + *) Fix apr_socket_opt_set() issue where TCP_NODELAY would be set when TCP_DEFER_ACCEPT was set. [Brian Pane] 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(); } |