Upstream tarball 2.2.17upstream/2.2.17

6 files changed, 75 insertions, 17 deletions

diff --git a/srclib/apr-util/test/Makefile.in b/srclib/apr-util/test/Makefile.in
index 97ff49b0..8a913197 100644
--- a/srclib/apr-util/test/Makefile.in
+++ b/srclib/apr-util/test/Makefile.in
@@ -12,7 +12,7 @@ VPATH = @srcdir@
 
 INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@
 
-STDTEST_PORTABLE = testall dbd
+STDTEST_PORTABLE = dbd testall
 
 TESTS = teststrmatch.lo testuri.lo testuuid.lo testbuckets.lo testpass.lo \
 	testmd4.lo testmd5.lo testldap.lo testdate.lo testdbm.lo testdbd.lo \
@@ -59,7 +59,7 @@ dbd: $(OBJECTS_dbd)
 check: $(TESTALL_COMPONENTS) $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE)
 	teststatus=0; \
 	progfailed=""; \
-	for prog in $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE); do \
+	for prog in $(STDTEST_NONPORTABLE) $(STDTEST_PORTABLE); do \
 	        if test "$$prog" = 'dbd'; then \
 			for driver in none @apu_dbd_tests@; do \
 				if test "$$driver" != 'none'; then \
diff --git a/srclib/apr-util/test/Makefile.win b/srclib/apr-util/test/Makefile.win
index c1c85336..9f5ca842 100644
--- a/srclib/apr-util/test/Makefile.win
+++ b/srclib/apr-util/test/Makefile.win
@@ -157,11 +157,11 @@ PATH=$(OUTDIR);..\$(OUTDIR);..\ldap\$(OUTDIR);..\dbd\$(OUTDIR);$(API_PATH)\$(OUT
 APR_ICONV1_PATH=$(API_PATH)\$(OUTDIR)\iconv
 
 check: $(PROGRAMS) $(OTHER_PROGRAMS)
+	echo Testing dbd sqlite2 && $(OUTDIR)\dbd.exe sqlite2 || echo Failed
+	echo Testing dbd sqlite3 && $(OUTDIR)\dbd.exe sqlite3 || echo Failed
 	@for %p in ($(PROGRAMS)) do @( \
 	    echo Testing %p && %p -v || echo %p failed \
 	)
-	echo Testing dbd sqlite2 && $(OUTDIR)\dbd.exe sqlite2 || echo Failed
-	echo Testing dbd sqlite3 && $(OUTDIR)\dbd.exe sqlite3 || echo Failed
 
 checkall: check
 
diff --git a/srclib/apr-util/test/abts.c b/srclib/apr-util/test/abts.c
index 9aa2e2a9..b2c65087 100644
--- a/srclib/apr-util/test/abts.c
+++ b/srclib/apr-util/test/abts.c
@@ -293,7 +293,7 @@ void abts_ptr_notnull(abts_case *tc, const void *ptr, int lineno)
 
     tc->failed = TRUE;
     if (verbose) {
-        fprintf(stderr, "Line %d: Expected NULL, but saw <%p>\n", lineno, ptr);
+        fprintf(stderr, "Line %d: expected non-NULL, but saw NULL\n", lineno);
         fflush(stderr);
     }
 }
diff --git a/srclib/apr-util/test/testall.dsw b/srclib/apr-util/test/testall.dsw
index 4d7cf10b..0d71a0ed 100644
--- a/srclib/apr-util/test/testall.dsw
+++ b/srclib/apr-util/test/testall.dsw
@@ -15,7 +15,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "apr_app"="..\..\apr\build\apr_app.dsp" - Package Owner=<4>
+Project: "aprapp"="..\..\apr\build\aprapp.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -24,7 +24,7 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name apr
+    Project_Dep_Name preaprapp
     End Project Dependency
 }}}
 
@@ -255,7 +255,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "libapr_app"="..\..\apr\build\libapr_app.dsp" - Package Owner=<4>
+Project: "libaprapp"="..\..\apr\build\libaprapp.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -264,7 +264,7 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name libapr
+    Project_Dep_Name prelibaprapp
     End Project Dependency
 }}}
 
@@ -348,6 +348,36 @@ Package=<4>
 
 ###############################################################################
 
+Project: "preaprapp"="..\..\apr\build\preaprapp.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name apr
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "prelibaprapp"="..\..\apr\build\prelibaprapp.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "testdll"="..\..\apr\test\testdll.dsp" - Package Owner=<4>
 
 Package=<5>
diff --git a/srclib/apr-util/test/testmemcache.c b/srclib/apr-util/test/testmemcache.c
index bcdf02e8..80bc10bd 100644
--- a/srclib/apr-util/test/testmemcache.c
+++ b/srclib/apr-util/test/testmemcache.c
@@ -72,8 +72,8 @@ typedef struct {
  * if you wanted to use some external hashing library or functions for
  * consistent hashing, for example, this would be a good place to do it.
  */
-apr_uint32_t my_hash_func(void *baton, const char *data,
-                          apr_size_t data_len)
+static apr_uint32_t my_hash_func(void *baton, const char *data,
+                                 apr_size_t data_len)
 {
 
   return HASH_FUNC_RESULT;
@@ -85,9 +85,9 @@ apr_uint32_t my_hash_func(void *baton, const char *data,
  * and pulls some number from the *baton, which is a struct that has some 
  * kind of meaningful stuff in it.
  */
-apr_memcache_server_t *my_server_func(void *baton, 
-                                      apr_memcache_t *mc,
-                                      const apr_uint32_t hash)
+static apr_memcache_server_t *my_server_func(void *baton, 
+                                             apr_memcache_t *mc,
+                                             const apr_uint32_t hash)
 {
   apr_memcache_server_t *ms = NULL;
   my_hash_server_baton *mhsb = (my_hash_server_baton *)baton;
@@ -106,7 +106,7 @@ apr_memcache_server_t *my_server_func(void *baton,
 }
 
 apr_uint16_t firsttime = 0;
-int randval(apr_uint32_t high)
+static int randval(apr_uint32_t high)
 {
     apr_uint32_t i = 0;
     double d = 0;
@@ -177,7 +177,7 @@ static void test_memcache_create(abts_case * tc, void *data)
 
 /* install our own custom hashing and server selection routines. */
 
-int create_test_hash(apr_pool_t *p, apr_hash_t *h)
+static int create_test_hash(apr_pool_t *p, apr_hash_t *h)
 {
   int i;
   
@@ -539,7 +539,7 @@ static void test_memcache_setget(abts_case * tc, void *data)
 /* use apr_socket stuff to see if there is in fact a memcached server 
  * running on PORT. 
  */
-apr_status_t check_mc(void)
+static apr_status_t check_mc(void)
 {
   apr_pool_t *pool = p;
   apr_status_t rv;
diff --git a/srclib/apr-util/test/testxml.c b/srclib/apr-util/test/testxml.c
index 1d170cd9..c9554de8 100644
--- a/srclib/apr-util/test/testxml.c
+++ b/srclib/apr-util/test/testxml.c
@@ -166,12 +166,40 @@ static void test_billion_laughs(abts_case *tc, void *data)
     apr_file_close(fd);
 }
 
+static void test_CVE_2009_3720_alpha(abts_case *tc, void *data)
+{
+    apr_xml_parser *xp;
+    apr_xml_doc *doc;
+    apr_status_t rv;
+
+    xp = apr_xml_parser_create(p);
+    
+    rv = apr_xml_parser_feed(xp, "\0\r\n", 3);
+    if (rv == APR_SUCCESS)
+        apr_xml_parser_done(xp, &doc);
+}
+
+static void test_CVE_2009_3720_beta(abts_case *tc, void *data)
+{
+    apr_xml_parser *xp;
+    apr_xml_doc *doc;
+    apr_status_t rv;
+
+    xp = apr_xml_parser_create(p);
+    
+    rv = apr_xml_parser_feed(xp, "<?xml version\xc2\x85='1.0'?>\r\n", 25);
+    if (rv == APR_SUCCESS)
+        apr_xml_parser_done(xp, &doc);
+}
+
 abts_suite *testxml(abts_suite *suite)
 {
     suite = ADD_SUITE(suite);
 
     abts_run_test(suite, test_xml_parser, NULL);
     abts_run_test(suite, test_billion_laughs, NULL);
+    abts_run_test(suite, test_CVE_2009_3720_alpha, NULL);
+    abts_run_test(suite, test_CVE_2009_3720_beta, NULL);
 
     return suite;
 }