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 Fri, 11 Jun 2004 13:44:14 GMT
trawick     2004/06/11 06:44:14

  Modified:    .        CHANGES
               server   vhost.c
  Log:
  <VirtualHost myhost> now applies to all IP addresses for myhost
  instead of just the first one reported by the resolver.  This
  corrects a regression since 1.3.
  
  Revision  Changes    Path
  1.1510    +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1509
  retrieving revision 1.1510
  diff -u -r1.1509 -r1.1510
  --- CHANGES	7 Jun 2004 11:02:52 -0000	1.1509
  +++ CHANGES	11 Jun 2004 13:44:13 -0000	1.1510
  @@ -2,6 +2,10 @@
   
     [Remove entries to the current 2.0 section below, when backported]
   
  +  *) <VirtualHost myhost> now applies to all IP addresses for myhost
  +     instead of just the first one reported by the resolver.  This
  +     corrects a regression since 1.3.  [Jeff Trawick]
  +
     *) <IfModule> now recognizes the module identifier in addition to the
        file name. PR 29003.  [Edward Rudd <eddie omegaware.com>, André Malo]
   
  
  
  
  1.87      +11 -8     httpd-2.0/server/vhost.c
  
  Index: vhost.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/vhost.c,v
  retrieving revision 1.86
  retrieving revision 1.87
  diff -u -r1.86 -r1.87
  --- vhost.c	15 Apr 2004 20:36:45 -0000	1.86
  +++ vhost.c	11 Jun 2004 13:44:14 -0000	1.87
  @@ -197,15 +197,18 @@
           }
       }
   
  -    /* XXX Gotta go through *all* addresses for the host name! 
  -     * Fix apr_sockaddr_info_get() to save them! */
  +    /* Remember all addresses for the host */
  +
  +    do {
  +        sar = apr_pcalloc(p, sizeof(server_addr_rec));
  +        **paddr = sar;
  +        *paddr = &sar->next;
  +        sar->host_addr = my_addr;
  +        sar->host_port = port;
  +        sar->virthost = host;
  +        my_addr = my_addr->next;
  +    } while (my_addr);
   
  -    sar = apr_pcalloc(p, sizeof(server_addr_rec));
  -    **paddr = sar;
  -    *paddr = &sar->next;
  -    sar->host_addr = my_addr;
  -    sar->host_port = port;
  -    sar->virthost = host;
       return NULL;
   }
   
  
  
  

Mime
View raw message