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 21:25:54 GMT
trawick     01/12/26 13:25:54

  Modified:    server   vhost.c
  Log:
  use a new APR function to perform socket address comparison so
  that we don't have to handle v4-mapped IPv6 addresses here
  
  Revision  Changes    Path
  1.67      +1 -15     httpd-2.0/server/vhost.c
  
  Index: vhost.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/vhost.c,v
  retrieving revision 1.66
  retrieving revision 1.67
  diff -u -r1.66 -r1.67
  --- vhost.c	2001/12/26 15:51:08	1.66
  +++ vhost.c	2001/12/26 21:25:54	1.67
  @@ -414,27 +414,13 @@
           if (cur->sa.sin.sin_port == 0 ||
               sa->sa.sin.sin_port == 0  ||
               cur->sa.sin.sin_port == sa->sa.sin.sin_port) {
  -            if (cur->ipaddr_len == sa->ipaddr_len &&
  -                !memcmp(cur->ipaddr_ptr,
  -                        sa->ipaddr_ptr,
  -                        sa->ipaddr_len)) {
  +            if (apr_sockaddr_equal(cur, sa)) {
                   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;
   }
  -
   
   static ipaddr_chain *find_default_server(apr_port_t port)
   {
  
  
  

Mime
View raw message