Merge r371172 to 0.9.x.

Original log message:

Fix an assert that occurs when you destroy a rwlock on win32 and later clear
the pool it was allocated from.

Submitted by: Evgueni Brevnov <evgueni.brevnov gmail.com>

* locks/win32/thread_rwlock.c
  (apr_thread_rwlock_destroy): Use apr_pool_cleanup_run to call our cleanup
   function.
  (thread_rwlock_cleanup): Put the destruction of the rwlock here instead
   of in the destructor function.

* test/testlock.c
  (test_thread_rwlocks): Destroy the rwlock explicitly so we can see this
   kind of problem.

* CHANGES: Note change.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/0.9.x@372615 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 2 insertions, 0 deletions

diff --git a/test/testlock.c b/test/testlock.c
index 3ede9c7e5..562008d6b 100644
--- a/test/testlock.c
+++ b/test/testlock.c
@@ -205,6 +205,8 @@ static void test_thread_rwlock(CuTest *tc)
     apr_thread_join(&s4, t4);
 
     CuAssertIntEquals(tc, MAX_ITER, x);
+
+    apr_thread_rwlock_destroy(rwlock);
 }
 
 static void test_cond(CuTest *tc)