Merge r1855877 from trunk:

apr_thread_cond_timedwait on windows should wait on the semaphore.

Fix r1792620's bad copy/paste from mutex code.

Submitted by: fedormsv gmail.com
Reviewed by: ylavic


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1855961 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 1 insertions, 1 deletions

diff --git a/locks/win32/thread_cond.c b/locks/win32/thread_cond.c
index d22567a88..f571f9ec9 100644
--- a/locks/win32/thread_cond.c
+++ b/locks/win32/thread_cond.c
@@ -99,7 +99,7 @@ static APR_INLINE apr_status_t thread_cond_timedwait(apr_thread_cond_t *cond,
                     t = 0;
                 }
             }
-            res = WaitForSingleObject(mutex->handle, timeout_ms);
+            res = WaitForSingleObject(cond->semaphore, timeout_ms);
         } while (res == WAIT_TIMEOUT && t > 0);
 
         EnterCriticalSection(&cond->csection);