Update subversion-1.8.0 -> 1.8.1. Update supporting

components: apr-1.4.6 -> 1.4.8 and apr-util-1.4.1 -> 1.5.2.

This is a post point-zero bug-fix / fix-sharp-edges release, including
some workarounds for UTF-8 for people who haven't yet turned on WITH_ICONV.

12 files changed, 224 insertions, 544 deletions

diff --git a/contrib/apr-util/test/Makefile.in b/contrib/apr-util/test/Makefile.in
index cf89a54..5f4cf91 100644
--- a/contrib/apr-util/test/Makefile.in
+++ b/contrib/apr-util/test/Makefile.in
@@ -34,7 +34,7 @@ APRUTIL_LDFLAGS = $(ALL_LDFLAGS) @LT_NO_INSTALL@ @APRUTIL_LDFLAGS@
 
 # link programs using -no-install to get real executables not
 # libtool wrapper scripts which link an executable when first run.
-LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(LT_LDFLAGS) $(COMPILE) \
+LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LT_LDFLAGS) \
 	    $(APRUTIL_LDFLAGS) -o $@
 
 # STDTEST_PORTABLE;
diff --git a/contrib/apr-util/test/Makefile.win b/contrib/apr-util/test/Makefile.win
index 9f5ca84..0305850 100644
--- a/contrib/apr-util/test/Makefile.win
+++ b/contrib/apr-util/test/Makefile.win
@@ -61,7 +61,8 @@ ALL_TESTS = $(INTDIR)\teststrmatch.obj $(INTDIR)\testuri.obj \
 	$(INTDIR)\testdbm.obj $(INTDIR)\testreslist.obj \
 	$(INTDIR)\testxml.obj $(INTDIR)\testqueue.obj \
 	$(INTDIR)\testrmm.obj $(INTDIR)\testxlate.obj \
-	$(INTDIR)\testdate.obj $(INTDIR)\testmemcache.obj
+	$(INTDIR)\testdate.obj $(INTDIR)\testmemcache.obj \
+	$(INTDIR)\testcrypto.obj
 
 CLEAN_DATA = manyfile.bin testfile.txt data\sqlite*.db
 
diff --git a/contrib/apr-util/test/NWGNUmakefile b/contrib/apr-util/test/NWGNUmakefile
index a36d178..a955f2c 100644
--- a/contrib/apr-util/test/NWGNUmakefile
+++ b/contrib/apr-util/test/NWGNUmakefile
@@ -243,6 +243,7 @@ nlms :: libs $(TARGET_nlm)
 #
 install :: nlms FORCE
 	$(call COPY,$(OBJDIR)/*.nlm,$(INSTALLBASE))
+	$(call COPYR,data,$(INSTALLBASE)/data/)
 
 #
 # Any specialized rules here
diff --git a/contrib/apr-util/test/testbuckets.c b/contrib/apr-util/test/testbuckets.c
index 807b2a5..3d0d46d 100644
--- a/contrib/apr-util/test/testbuckets.c
+++ b/contrib/apr-util/test/testbuckets.c
@@ -469,6 +469,48 @@ static void test_partition(abts_case *tc, void *data)
     apr_bucket_alloc_destroy(ba);
 }
 
+static void test_write_split(abts_case *tc, void *data)
+{
+    apr_bucket_alloc_t *ba = apr_bucket_alloc_create(p);
+    apr_bucket_brigade *bb1 = apr_brigade_create(p, ba);
+    apr_bucket_brigade *bb2;
+    apr_bucket *e;
+
+    e = apr_bucket_heap_create(hello, strlen(hello), NULL, ba);
+    APR_BRIGADE_INSERT_HEAD(bb1, e);
+    apr_bucket_split(e, strlen("hello, "));
+    bb2 = apr_brigade_split(bb1, APR_BRIGADE_LAST(bb1));
+    apr_brigade_write(bb1, NULL, NULL, "foo", strlen("foo"));
+    test_bucket_content(tc, APR_BRIGADE_FIRST(bb2), "world", 5);
+
+    apr_brigade_destroy(bb1);
+    apr_brigade_destroy(bb2);
+    apr_bucket_alloc_destroy(ba);
+}
+
+static void test_write_putstrs(abts_case *tc, void *data)
+{
+    apr_bucket_alloc_t *ba = apr_bucket_alloc_create(p);
+    apr_bucket_brigade *bb = apr_brigade_create(p, ba);
+    apr_bucket *e;
+    char buf[30];
+    apr_size_t len = sizeof(buf);
+    const char *expect = "123456789abcdefghij";
+
+    e = apr_bucket_heap_create("1", 1, NULL, ba);
+    APR_BRIGADE_INSERT_HEAD(bb, e);
+
+    apr_brigade_putstrs(bb, NULL, NULL, "2", "34", "567", "8", "9a", "bcd",
+                        "e", "f", "gh", "i", NULL);
+    apr_brigade_putstrs(bb, NULL, NULL, "j", NULL);
+    apr_assert_success(tc, "apr_brigade_flatten",
+                       apr_brigade_flatten(bb, buf, &len));
+    ABTS_STR_NEQUAL(tc, expect, buf, strlen(expect));
+
+    apr_brigade_destroy(bb);
+    apr_bucket_alloc_destroy(ba);
+}
+
 abts_suite *testbuckets(abts_suite *suite)
 {
     suite = ADD_SUITE(suite);
@@ -484,6 +526,8 @@ abts_suite *testbuckets(abts_suite *suite)
     abts_run_test(suite, test_manyfile, NULL);
     abts_run_test(suite, test_truncfile, NULL);
     abts_run_test(suite, test_partition, NULL);
+    abts_run_test(suite, test_write_split, NULL);
+    abts_run_test(suite, test_write_putstrs, NULL);
 
     return suite;
 }
diff --git a/contrib/apr-util/test/testmd5.c b/contrib/apr-util/test/testmd5.c
index 5189993..4e13da2 100644
--- a/contrib/apr-util/test/testmd5.c
+++ b/contrib/apr-util/test/testmd5.c
@@ -66,6 +66,30 @@ static void test_md5sum(abts_case *tc, void *data)
                     (memcmp(digest, sum, APR_MD5_DIGESTSIZE) == 0));
 }
 
+static void test_md5sum_unaligned(abts_case *tc, void *data)
+{
+        apr_md5_ctx_t context;
+        const char *string = "abcdefghijklmnopqrstuvwxyz01234"
+                             "abcdefghijklmnopqrstuvwxyz01234"
+                             "abcdefghijklmnopqrstuvwxyz01234"
+                             "abcdefghijklmnopqrstuvwxyz01234_";
+        const char *sum =
+            "\x93\x17\x22\x78\xee\x30\x82\xb3\xeb\x95\x33\xec\xea\x78\xb7\x89";
+        unsigned char digest[APR_MD5_DIGESTSIZE];
+        unsigned int i;
+
+        ABTS_ASSERT(tc, "apr_md5_init", (apr_md5_init(&context) == 0));
+        for (i = 0; i < 10; i++) {
+                ABTS_ASSERT(tc, "apr_md5_update",
+                    (apr_md5_update(&context, string, strlen(string)) == 0));
+                string++;
+        }
+        ABTS_ASSERT(tc, "apr_md5_final", (apr_md5_final(digest, &context)
+                                          == 0));
+        ABTS_ASSERT(tc, "check for correct md5 digest of unaligned data",
+                    (memcmp(digest, sum, APR_MD5_DIGESTSIZE) == 0));
+}
+
 abts_suite *testmd5(abts_suite *suite)
 {
         suite = ADD_SUITE(suite);
@@ -73,6 +97,7 @@ abts_suite *testmd5(abts_suite *suite)
         for (count=0; count < num_sums; count++) {
             abts_run_test(suite, test_md5sum, NULL);
         }
+        abts_run_test(suite, test_md5sum_unaligned, NULL);
 
         return suite;
 }
diff --git a/contrib/apr-util/test/testmemcache.c b/contrib/apr-util/test/testmemcache.c
index 4947621..958afa66 100644
--- a/contrib/apr-util/test/testmemcache.c
+++ b/contrib/apr-util/test/testmemcache.c
@@ -433,6 +433,7 @@ static void test_memcache_multiget(abts_case * tc, void *data)
   rv = apr_memcache_add_server(memcache, server);
   ABTS_ASSERT(tc, "server add failed", rv == APR_SUCCESS);
   
+  values = apr_hash_make(p);
   tdata = apr_hash_make(p);
   
   create_test_hash(pool, tdata);
@@ -603,10 +604,10 @@ abts_suite *testmemcache(abts_suite * suite)
     apr_status_t rv;
     suite = ADD_SUITE(suite);
     /* check for a running memcached on the typical port before 
-     * trying to run the tests. succeed silently if we don't find one.
+     * trying to run the tests. succeed if we don't find one.
      */
     rv = check_mc();
-    if(rv == APR_SUCCESS) {
+    if (rv == APR_SUCCESS) {
       abts_run_test(suite, test_memcache_create, NULL);
       abts_run_test(suite, test_memcache_user_funcs, NULL);
       abts_run_test(suite, test_memcache_meta, NULL);
@@ -615,6 +616,11 @@ abts_suite *testmemcache(abts_suite * suite)
       abts_run_test(suite, test_memcache_addreplace, NULL);
       abts_run_test(suite, test_memcache_incrdecr, NULL);
     }
+    else {
+        abts_log_message("Error %d occurred attempting to reach memcached "
+                         "on %s:%d.  Skipping apr_memcache tests...",
+                         rv, HOST, PORT);
+    }
 
     return suite;
 }
diff --git a/contrib/apr-util/test/testpass.c b/contrib/apr-util/test/testpass.c
index 0ec128b..0b0ebcc 100644
--- a/contrib/apr-util/test/testpass.c
+++ b/contrib/apr-util/test/testpass.c
@@ -34,6 +34,12 @@
 #define CRYPT_ALGO_SUPPORTED 1
 #endif
 
+#if defined __GLIBC_PREREQ
+#if __GLIBC_PREREQ(2,7)
+#define GLIBCSHA_ALGO_SUPPORTED
+#endif
+#endif
+
 #if CRYPT_ALGO_SUPPORTED
 
 static struct {
@@ -117,25 +123,80 @@ static void test_threadsafe(abts_case *tc, void *data)
 static void test_shapass(abts_case *tc, void *data)
 {
     const char *pass = "hellojed";
+    const char *pass2 = "hellojed2";
     char hash[100];
 
     apr_sha1_base64(pass, strlen(pass), hash);
 
     apr_assert_success(tc, "SHA1 password validated",
                        apr_password_validate(pass, hash));
+    APR_ASSERT_FAILURE(tc, "wrong SHA1 password should not validate",
+                       apr_password_validate(pass2, hash));
 }
 
 static void test_md5pass(abts_case *tc, void *data)
 {
     const char *pass = "hellojed", *salt = "sardine";
+    const char *pass2 = "hellojed2";
     char hash[100];
 
     apr_md5_encode(pass, salt, hash, sizeof hash);
 
     apr_assert_success(tc, "MD5 password validated",
                        apr_password_validate(pass, hash));
+    APR_ASSERT_FAILURE(tc, "wrong MD5 password should not validate",
+                       apr_password_validate(pass2, hash));
+}
+
+#ifdef GLIBCSHA_ALGO_SUPPORTED
+
+static struct {
+    const char *password;
+    const char *hash;
+} glibc_sha_pws[] = {
+    /* SHA256 */
+    { "secret1", "$5$0123456789abcdef$SFX.CooXBS8oXsbAPgU/UyiCodhrLQ19sBgvcA3Zh1D" },
+    { "secret2", "$5$rounds=100000$0123456789abcdef$dLXfO5m4d.xv8G66kpz2LyL0.Mi5wjLlH0m7rtgyhyB" },
+    /* SHA512 */
+    { "secret3", "$6$0123456789abcdef$idOsOfoWwnCQkJm9hd2hxS4NnEs9nBA9poOFXsvtrYSoSHaOToCfyUoZwKe.ZCZnq7D95tGVoi2jxZZMyVwTL1" },
+    { "secret4", "$6$rounds=100000$0123456789abcdef$ZiAMjbeA.iIGTWxq2oks9Bvz9sfxaoGPgAtpwimPEwFwkSNMTK7lLwABzzldds/n4UgCQ16HqawPrCrePr4YX1" },
+    { NULL, NULL }
+};
+
+static void test_glibc_shapass(abts_case *tc, void *data)
+{
+    int i = 0;
+    while (glibc_sha_pws[i].password) {
+        apr_assert_success(tc, "check for valid glibc crypt-sha password",
+                           apr_password_validate(glibc_sha_pws[i].password,
+                                                 glibc_sha_pws[i].hash));
+        i++;
+    }
+}
+#endif
+
+static void test_bcryptpass(abts_case *tc, void *data)
+{
+    const char *pass = "hellojed";
+    const char *pass2 = "hellojed2";
+    unsigned char salt[] = "sardine_sardine";
+    char hash[100];
+    const char *hash2 = "$2a$08$qipUJiI9fySUN38hcbz.lucXvAmtgowKOWYtB9y3CXyl6lTknruou";
+    const char *pass3 = "foobar";
+
+    apr_assert_success(tc, "bcrypt encode password", 
+                       apr_bcrypt_encode(pass, 5, salt, sizeof(salt), hash,
+                                         sizeof(hash)));
+
+    apr_assert_success(tc, "bcrypt password validated",
+                       apr_password_validate(pass, hash));
+    APR_ASSERT_FAILURE(tc, "wrong bcrypt password should not validate",
+                       apr_password_validate(pass2, hash));
+    apr_assert_success(tc, "bcrypt password validated",
+                       apr_password_validate(pass3, hash2));
 }
 
+
 abts_suite *testpass(abts_suite *suite)
 {
     suite = ADD_SUITE(suite);
@@ -148,6 +209,10 @@ abts_suite *testpass(abts_suite *suite)
 #endif /* CRYPT_ALGO_SUPPORTED */
     abts_run_test(suite, test_shapass, NULL);
     abts_run_test(suite, test_md5pass, NULL);
+    abts_run_test(suite, test_bcryptpass, NULL);
+#ifdef GLIBCSHA_ALGO_SUPPORTED
+    abts_run_test(suite, test_glibc_shapass, NULL);
+#endif
     
     return suite;
 }
diff --git a/contrib/apr-util/test/testuri.c b/contrib/apr-util/test/testuri.c
index ef43388..d0b51e1 100644
--- a/contrib/apr-util/test/testuri.c
+++ b/contrib/apr-util/test/testuri.c
@@ -123,6 +123,66 @@ struct aup_test aup_tests[] =
         "file:../photos/image.jpg",
         0, "file", NULL, NULL, NULL, NULL, NULL, "../photos/image.jpg", NULL, NULL, 0
     },
+    {
+        "file+ssh-2:../photos/image.jpg",
+        0, "file+ssh-2", NULL, NULL, NULL, NULL, NULL, "../photos/image.jpg", NULL, NULL, 0
+    },
+    {
+        "script/foo.js",
+        0, NULL, NULL, NULL, NULL, NULL, NULL, "script/foo.js", NULL, NULL, 0
+    },
+    {
+        "../foo2.js",
+        0, NULL, NULL, NULL, NULL, NULL, NULL, "../foo2.js", NULL, NULL, 0
+    },
+    {
+        "foo3.js",
+        0, NULL, NULL, NULL, NULL, NULL, NULL, "foo3.js", NULL, NULL, 0
+    },
+    {
+        "_foo/bar",
+        0, NULL, NULL, NULL, NULL, NULL, NULL, "_foo/bar", NULL, NULL, 0
+    },
+    {
+        "_foo:/bar",
+        APR_EGENERAL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0
+    },
+    {
+        "2foo:/bar",
+        APR_EGENERAL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0
+    },
+    {
+        ".foo:/bar",
+        APR_EGENERAL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0
+    },
+    {
+        "-foo:/bar",
+        APR_EGENERAL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0
+    },
+    {
+        "+foo:/bar",
+        APR_EGENERAL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0
+    },
+    {
+        "::/bar",
+        APR_EGENERAL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0
+    },
+    {
+        ":/bar",
+        APR_EGENERAL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0
+    },
+    {
+        ":foo",
+        APR_EGENERAL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0
+    },
+    {
+        ":",
+        APR_EGENERAL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0
+    },
+    {
+        "@localhost::8080",
+        APR_EGENERAL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0
+    },
 };
 
 struct uph_test {
diff --git a/contrib/apr-util/test/testutil.c b/contrib/apr-util/test/testutil.c
index 11a1923..e5f8460 100644
--- a/contrib/apr-util/test/testutil.c
+++ b/contrib/apr-util/test/testutil.c
@@ -37,6 +37,18 @@ void apr_assert_success(abts_case* tc, const char* context, apr_status_t rv)
     }
 }
 
+void apr_assert_failure(abts_case* tc, const char* context, apr_status_t rv,
+                        int lineno)
+{
+    if (rv == APR_ENOTIMPL) {
+        abts_not_impl(tc, context, lineno);
+    } else if (rv == APR_SUCCESS) {
+        char buf[STRING_MAX];
+        sprintf(buf, "%s (%d): expected failure, got success\n", context, rv);
+        abts_fail(tc, buf, lineno);
+    }
+}
+
 void initialize(void) {
     if (apr_initialize() != APR_SUCCESS) {
         abort();
diff --git a/contrib/apr-util/test/testutil.h b/contrib/apr-util/test/testutil.h
index 07b34a8..c471af4 100644
--- a/contrib/apr-util/test/testutil.h
+++ b/contrib/apr-util/test/testutil.h
@@ -41,6 +41,12 @@ extern apr_pool_t *p;
  * for RV and CONTEXT message. */
 void apr_assert_success(abts_case* tc, const char *context, apr_status_t rv);
 
+void apr_assert_failure(abts_case* tc, const char *context,
+                        apr_status_t rv, int lineno);
+#define APR_ASSERT_FAILURE(tc, ctxt, rv) \
+             apr_assert_failure(tc, ctxt, rv, __LINE__)
+
+
 void initialize(void);
 
 abts_suite *teststrmatch(abts_suite *suite);
diff --git a/contrib/apr-util/test/testutildll.dsp b/contrib/apr-util/test/testutildll.dsp
deleted file mode 100644
index 9c90a16d9..0000000
--- a/contrib/apr-util/test/testutildll.dsp
+++ /dev/null
@@ -1,270 +0,0 @@
-# Microsoft Developer Studio Project File - Name="testutildll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) External Target" 0x0106
-
-CFG=testutildll - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "testutildll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "testutildll.mak" CFG="testutildll - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "testutildll - Win32 Release" (based on "Win32 (x86) External Target")
-!MESSAGE "testutildll - Win32 Debug" (based on "Win32 (x86) External Target")
-!MESSAGE "testutildll - Win32 Release9x" (based on "Win32 (x86) External Target")
-!MESSAGE "testutildll - Win32 Debug9x" (based on "Win32 (x86) External Target")
-!MESSAGE "testutildll - x64 Release" (based on "Win32 (x86) External Target")
-!MESSAGE "testutildll - x64 Debug" (based on "Win32 (x86) External Target")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "testutildll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ""
-# PROP BASE Intermediate_Dir ""
-# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=Release OUTDIR=Release MODEL=dynamic all check"
-# PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "Release\testall.exe"
-# PROP BASE Bsc_Name ""
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
-# PROP Intermediate_Dir ""
-# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=Release OUTDIR=Release MODEL=dynamic all check"
-# PROP Rebuild_Opt "/a"
-# PROP Target_File "Release\testall.exe"
-# PROP Bsc_Name ""
-# PROP Target_Dir ""
-
-!ELSEIF  "$(CFG)" == "testutildll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ""
-# PROP BASE Intermediate_Dir ""
-# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=Debug OUTDIR=Debug MODEL=dynamic _DEBUG=1 all check"
-# PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "Debug\testall.exe"
-# PROP BASE Bsc_Name ""
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ""
-# PROP Intermediate_Dir ""
-# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=Debug OUTDIR=Debug MODEL=dynamic _DEBUG=1 all check"
-# PROP Rebuild_Opt "/a"
-# PROP Target_File "Debug\testall.exe"
-# PROP Bsc_Name ""
-# PROP Target_Dir ""
-
-!ELSEIF  "$(CFG)" == "testutildll - Win32 Release9x"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ""
-# PROP BASE Intermediate_Dir ""
-# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=9x\Release OUTDIR=9x\Release MODEL=dynamic all check"
-# PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "9x\Release\testall.exe"
-# PROP BASE Bsc_Name ""
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
-# PROP Intermediate_Dir ""
-# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=9x\Release OUTDIR=9x\Release MODEL=dynamic all check"
-# PROP Rebuild_Opt "/a"
-# PROP Target_File "9x\Release\testall.exe"
-# PROP Bsc_Name ""
-# PROP Target_Dir ""
-
-!ELSEIF  "$(CFG)" == "testutildll - Win32 Debug9x"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ""
-# PROP BASE Intermediate_Dir ""
-# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=9x\Debug OUTDIR=9x\Debug MODEL=dynamic _DEBUG=1 all check"
-# PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "9x\Debug\testall.exe"
-# PROP BASE Bsc_Name ""
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ""
-# PROP Intermediate_Dir ""
-# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=9x\Debug OUTDIR=9x\Debug MODEL=dynamic _DEBUG=1 all check"
-# PROP Rebuild_Opt "/a"
-# PROP Target_File "9x\Debug\testall.exe"
-# PROP Bsc_Name ""
-# PROP Target_Dir ""
-
-!ELSEIF  "$(CFG)" == "testutildll - x64 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ""
-# PROP BASE Intermediate_Dir ""
-# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=x64\Release OUTDIR=x64\Release MODEL=dynamic all check"
-# PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "x64\Release\testall.exe"
-# PROP BASE Bsc_Name ""
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
-# PROP Intermediate_Dir ""
-# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=x64\Release OUTDIR=x64\Release MODEL=dynamic all check"
-# PROP Rebuild_Opt "/a"
-# PROP Target_File "x64\Release\testall.exe"
-# PROP Bsc_Name ""
-# PROP Target_Dir ""
-
-!ELSEIF  "$(CFG)" == "testutildll - x64 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ""
-# PROP BASE Intermediate_Dir ""
-# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=x64\Debug OUTDIR=x64\Debug MODEL=dynamic _DEBUG=1 all check"
-# PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "x64\Debug\testall.exe"
-# PROP BASE Bsc_Name ""
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ""
-# PROP Intermediate_Dir ""
-# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=x64\Debug OUTDIR=x64\Debug MODEL=dynamic _DEBUG=1 all check"
-# PROP Rebuild_Opt "/a"
-# PROP Target_File "x64\Debug\testall.exe"
-# PROP Bsc_Name ""
-# PROP Target_Dir ""
-
-!ENDIF 
-
-# Begin Target
-
-# Name "testutildll - Win32 Release"
-# Name "testutildll - Win32 Debug"
-# Name "testutildll - Win32 Release9x"
-# Name "testutildll - Win32 Debug9x"
-# Name "testutildll - x64 Release"
-# Name "testutildll - x64 Debug"
-# Begin Group "testall Source Files"
-
-# PROP Default_Filter ".c"
-# Begin Source File
-
-SOURCE=.\abts.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\abts.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\abts_tests.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\testbuckets.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testdate.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testdbd.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testdbm.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testldap.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testmd4.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testmd5.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testmemcache.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testpass.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testqueue.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testreslist.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testrmm.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\teststrmatch.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testuri.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testutil.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testuuid.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testxlate.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testxml.c
-# End Source File
-# End Group
-# Begin Group "Other Source Files"
-
-# PROP Default_Filter ".c"
-# Begin Source File
-
-SOURCE=.\dbd.c
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=.\Makefile.win
-# End Source File
-# End Target
-# End Project
diff --git a/contrib/apr-util/test/testutillib.dsp b/contrib/apr-util/test/testutillib.dsp
deleted file mode 100644
index 6df114c..0000000
--- a/contrib/apr-util/test/testutillib.dsp
+++ /dev/null
@@ -1,270 +0,0 @@
-# Microsoft Developer Studio Project File - Name="testutillib" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) External Target" 0x0106
-
-CFG=testutillib - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "testutillib.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "testutillib.mak" CFG="testutillib - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "testutillib - Win32 Release" (based on "Win32 (x86) External Target")
-!MESSAGE "testutillib - Win32 Debug" (based on "Win32 (x86) External Target")
-!MESSAGE "testutillib - Win32 Release9x" (based on "Win32 (x86) External Target")
-!MESSAGE "testutillib - Win32 Debug9x" (based on "Win32 (x86) External Target")
-!MESSAGE "testutillib - x64 Release" (based on "Win32 (x86) External Target")
-!MESSAGE "testutillib - x64 Debug" (based on "Win32 (x86) External Target")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "testutillib - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ""
-# PROP BASE Intermediate_Dir ""
-# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=LibR OUTDIR=LibR MODEL=static all check"
-# PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "LibR\testall.exe"
-# PROP BASE Bsc_Name ""
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
-# PROP Intermediate_Dir ""
-# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=LibR OUTDIR=LibR MODEL=static all check"
-# PROP Rebuild_Opt "/a"
-# PROP Target_File "LibR\testall.exe"
-# PROP Bsc_Name ""
-# PROP Target_Dir ""
-
-!ELSEIF  "$(CFG)" == "testutillib - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ""
-# PROP BASE Intermediate_Dir ""
-# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=LibD OUTDIR=LibD MODEL=static _DEBUG=1 all check"
-# PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "LibD\testall.exe"
-# PROP BASE Bsc_Name ""
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ""
-# PROP Intermediate_Dir ""
-# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=LibD OUTDIR=LibD MODEL=static _DEBUG=1 all check"
-# PROP Rebuild_Opt "/a"
-# PROP Target_File "LibD\testall.exe"
-# PROP Bsc_Name ""
-# PROP Target_Dir ""
-
-!ELSEIF  "$(CFG)" == "testutillib - Win32 Release9x"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ""
-# PROP BASE Intermediate_Dir ""
-# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=9x\LibR OUTDIR=9x\LibR MODEL=static all check"
-# PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "9x\LibR\testall.exe"
-# PROP BASE Bsc_Name ""
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
-# PROP Intermediate_Dir ""
-# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=9x\LibR OUTDIR=9x\LibR MODEL=static all check"
-# PROP Rebuild_Opt "/a"
-# PROP Target_File "9x\LibR\testall.exe"
-# PROP Bsc_Name ""
-# PROP Target_Dir ""
-
-!ELSEIF  "$(CFG)" == "testutillib - Win32 Debug9x"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ""
-# PROP BASE Intermediate_Dir ""
-# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=9x\LibD OUTDIR=9x\LibD MODEL=static _DEBUG=1 all check"
-# PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "9x\LibD\testall.exe"
-# PROP BASE Bsc_Name ""
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ""
-# PROP Intermediate_Dir ""
-# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=9x\LibD OUTDIR=9x\LibD MODEL=static _DEBUG=1 all check"
-# PROP Rebuild_Opt "/a"
-# PROP Target_File "9x\LibD\testall.exe"
-# PROP Bsc_Name ""
-# PROP Target_Dir ""
-
-!ELSEIF  "$(CFG)" == "testutillib - x64 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ""
-# PROP BASE Intermediate_Dir ""
-# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=x64\LibR OUTDIR=x64\LibR MODEL=static all check"
-# PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "x64\LibR\testall.exe"
-# PROP BASE Bsc_Name ""
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
-# PROP Intermediate_Dir ""
-# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=x64\LibR OUTDIR=x64\LibR MODEL=static all check"
-# PROP Rebuild_Opt "/a"
-# PROP Target_File "x64\LibR\testall.exe"
-# PROP Bsc_Name ""
-# PROP Target_Dir ""
-
-!ELSEIF  "$(CFG)" == "testutillib - x64 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ""
-# PROP BASE Intermediate_Dir ""
-# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=x64\LibD OUTDIR=x64\LibD MODEL=static _DEBUG=1 all check"
-# PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "x64\LibD\testall.exe"
-# PROP BASE Bsc_Name ""
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ""
-# PROP Intermediate_Dir ""
-# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=x64\LibD OUTDIR=x64\LibD MODEL=static _DEBUG=1 all check"
-# PROP Rebuild_Opt "/a"
-# PROP Target_File "x64\LibD\testall.exe"
-# PROP Bsc_Name ""
-# PROP Target_Dir ""
-
-!ENDIF 
-
-# Begin Target
-
-# Name "testutillib - Win32 Release"
-# Name "testutillib - Win32 Debug"
-# Name "testutillib - Win32 Release9x"
-# Name "testutillib - Win32 Debug9x"
-# Name "testutillib - x64 Release"
-# Name "testutillib - x64 Debug"
-# Begin Group "testall Source Files"
-
-# PROP Default_Filter ".c"
-# Begin Source File
-
-SOURCE=.\abts.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\abts.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\abts_tests.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\testbuckets.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testdate.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testdbd.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testdbm.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testldap.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testmd4.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testmd5.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testmemcache.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testpass.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testqueue.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testreslist.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testrmm.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\teststrmatch.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testuri.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testutil.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testuuid.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testxlate.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testxml.c
-# End Source File
-# End Group
-# Begin Group "Other Source Files"
-
-# PROP Default_Filter ".c"
-# Begin Source File
-
-SOURCE=.\dbd.c
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=.\Makefile.win
-# End Source File
-# End Target
-# End Project