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 19:39:11 GMT
trawick     2004/06/11 12:39:11

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               server   Tag: APACHE_2_0_BRANCH 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.
  
  Submitted by:	Jeff Trawick
  Reviewed by:	stoddard, jim
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.300 +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.299
  retrieving revision 1.988.2.300
  diff -u -r1.988.2.299 -r1.988.2.300
  --- CHANGES	11 Jun 2004 16:15:41 -0000	1.988.2.299
  +++ CHANGES	11 Jun 2004 19:39:10 -0000	1.988.2.300
  @@ -1,5 +1,9 @@
   Changes with Apache 2.0.50
   
  +  *) <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]
  +
     *) util_ldap: allow relative paths for LDAPTrustedCA to be resolved
        against ServerRoot PR#26602 [Brad Nicholes]
          
  
  
  
  1.751.2.917 +1 -7      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.916
  retrieving revision 1.751.2.917
  diff -u -r1.751.2.916 -r1.751.2.917
  --- STATUS	11 Jun 2004 16:15:42 -0000	1.751.2.916
  +++ STATUS	11 Jun 2004 19:39:10 -0000	1.751.2.917
  @@ -72,12 +72,6 @@
     [ please place file names and revisions from HEAD here, so it is easy to
       identify exactly what the proposed changes are! ]
   
  -    *) <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.
  -         server/vhost.c r1.87
  -       +1: trawick, stoddard, jim
  -
       *) mod_ssl: Remove some unused functions (after CAN-2004-0488 fix is applied)
          http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/ssl/ssl_util.c?r1=1.46&r2=1.47
          +1: jorton, nd
  
  
  
  No                   revision
  No                   revision
  1.78.2.5  +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.78.2.4
  retrieving revision 1.78.2.5
  diff -u -r1.78.2.4 -r1.78.2.5
  --- vhost.c	9 Feb 2004 20:59:46 -0000	1.78.2.4
  +++ vhost.c	11 Jun 2004 19:39:11 -0000	1.78.2.5
  @@ -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