summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorjorton <jorton@13f79535-47bb-0310-9956-ffa450edef68>2012-12-11 12:06:43 +0000
committerjorton <jorton@13f79535-47bb-0310-9956-ffa450edef68>2012-12-11 12:06:43 +0000
commitb790a1fca0cee725ed29b31bd68d7f15252f6a0f (patch)
tree39e1ecbe6c9a0c845433e1a39198856e4eba6132 /test
parent56617c0de8f76ce44c0769fe01360d5ec84e3304 (diff)
downloadlibapr-b790a1fca0cee725ed29b31bd68d7f15252f6a0f.tar.gz
Merge 1405985 from trunk:
* network_io/unix/sockaddr.c (apr_ipsubnet_test): Fix false positive when testing a v4 subnet against a v6 address. * test/testipsub.c (test_interesting_subnets): Add test. PR: 54047 git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.4.x@1420116 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test')
-rw-r--r--test/testipsub.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/test/testipsub.c b/test/testipsub.c
index 8fd36721d..804bb3dcd 100644
--- a/test/testipsub.c
+++ b/test/testipsub.c
@@ -119,6 +119,7 @@ static void test_interesting_subnets(abts_case *tc, void *data)
,{"127", NULL, APR_INET, "127.0.0.1", "10.1.2.3"}
,{"127.0.0.1", "8", APR_INET, "127.0.0.1", "10.1.2.3"}
#if APR_HAVE_IPV6
+ ,{"38.0.0.0", "8", APR_INET6, "::ffff:38.1.1.1", "2600::1"} /* PR 54047 */
,{"fe80::", "8", APR_INET6, "fe80::1", "ff01::1"}
,{"ff01::", "8", APR_INET6, "ff01::1", "fe80::1"}
,{"3FFE:8160::", "28", APR_INET6, "3ffE:816e:abcd:1234::1", "3ffe:8170::1"}