dgaudet 98/03/02 09:53:48
Modified: src/main http_vhost.c Log: some systems #define s_addr s_addr_list[0].S_un or something like that, so s_addr is offlimits Revision Changes Path 1.9 +4 -4 apache-1.3/src/main/http_vhost.c Index: http_vhost.c =================================================================== RCS file: /export/home/cvs/apache-1.3/src/main/http_vhost.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- http_vhost.c 1998/03/02 06:51:11 1.8 +++ http_vhost.c 1998/03/02 17:53:47 1.9 @@ -373,14 +373,14 @@ { unsigned bucket; ipaddr_chain *trav; - unsigned s_addr; + unsigned addr; /* scan the hash table for an exact match first */ - s_addr = server_ip->s_addr; - bucket = hash_inaddr(s_addr); + addr = server_ip->s_addr; + bucket = hash_inaddr(addr); for (trav = iphash_table[bucket]; trav; trav = trav->next) { server_addr_rec *sar = trav->sar; - if ((sar->host_addr.s_addr == s_addr) + if ((sar->host_addr.s_addr == addr) && (sar->host_port == 0 || sar->host_port == port || port == 0)) { return trav;