httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/server vhost.c
Date Wed, 26 Dec 2001 15:51:08 GMT
trawick     01/12/26 07:51:08

  Modified:    .        CHANGES
               server   vhost.c
  Log:
  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.
  
  Revision  Changes    Path
  1.487     +5 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.486
  retrieving revision 1.487
  diff -u -r1.486 -r1.487
  --- CHANGES	2001/12/26 12:07:55	1.486
  +++ CHANGES	2001/12/26 15:51:07	1.487
  @@ -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]
   
  
  
  
  1.66      +10 -0     httpd-2.0/server/vhost.c
  
  Index: vhost.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/vhost.c,v
  retrieving revision 1.65
  retrieving revision 1.66
  diff -u -r1.65 -r1.66
  --- vhost.c	2001/12/25 21:46:10	1.65
  +++ vhost.c	2001/12/26 15:51:08	1.66
  @@ -420,6 +420,16 @@
                           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;
  
  
  

Mime
View raw message