Commit 196cadc6 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

<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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@103909 13f79535-47bb-0310-9956-ffa450edef68
parent 63a3d968

CHANGES

+4 −0
Changes for CHANGES: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line 
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]









       


































STATUS



+1
−7



























Changes for STATUS: 1 added line, 7 removed lines.



Original line number
Diff line number
Diff line









APACHE 2.0 STATUS:                                              -*-text-*-









Last modified at [$Date: 2004/06/11 16:15:42 $]









Last modified at [$Date: 2004/06/11 19:39:10 $]



















Release:




















@@ -72,12 +72,6 @@ PATCHES TO BACKPORT FROM 2.1







  [ 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


































server/vhost.c



+5
−2



























Changes for server/vhost.c: 5 added lines, 2 removed lines.



Original line number
Diff line number
Diff line







@@ -197,15 +197,18 @@ static const char *get_addresses(apr_pool_t *p, const char *w_,







        }









    }



















    /* 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);



















    return NULL;









}