From: Jeff Trawick <trawick@apache.org>
Date: Wed, 26 Dec 2001 15:51:08 +0000 (+0000)
Subject: Fix matching of vhosts by ip address so we find IPv4
X-Git-Tag: 2.0.30~126
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=860303d77ef3b41c9ed198d510d42ed408d4fb05;p=apache

Fix matching of vhosts by ip address so we find IPv4
vhost address when target address is v4-mapped form of
that address.

This problem was reported by Don Hughes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92607 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 5c4bd81c6f..323c492560 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,9 @@
 Changes with Apache 2.0.30-dev
+
+  *) Fix matching of vhosts by ip address so we find IPv4
+     vhost address when target address is v4-mapped form of
+     that address.  [Jeff Trawick]
+
   *) More performance tweaks to the BNDM string-search algorithm
      used to find "<!--#" tokens in mod_include [Brian Pane]
 
diff --git a/server/vhost.c b/server/vhost.c
index 23217e324b..92da4bd310 100644
--- a/server/vhost.c
+++ b/server/vhost.c
@@ -420,6 +420,16 @@ static APR_INLINE ipaddr_chain *find_ipaddr(apr_sockaddr_t *sa)
                         sa->ipaddr_len)) {
                 return trav;
             }
+#if APR_HAVE_IPV6
+            else if (cur->sa.sin.sin_family == AF_INET &&
+                     sa->sa.sin.sin_family == AF_INET6 &&
+                     IN6_IS_ADDR_V4MAPPED((struct in6_addr *)sa->ipaddr_ptr) &&
+                     !memcmp(&((struct in6_addr *)sa->ipaddr_ptr)->s6_addr[12],
+                             cur->ipaddr_ptr,
+                             4)) {
+                return trav;
+            }
+#endif
         }    
     }
     return NULL;