chuck 97/04/27 20:47:09
Modified: src/modules/proxy mod_proxy.c
Log:
Check return values for proxy_host2addr() when reading config, in case the
hostent struct returned is trash. (PR #491)
Revision Changes Path
1.11 +2 -5 apache/src/modules/proxy/mod_proxy.c
Index: mod_proxy.c
===================================================================
RCS file: /export/home/cvs/apache/src/modules/proxy/mod_proxy.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C3 -r1.10 -r1.11
*** mod_proxy.c 1997/04/11 05:10:49 1.10
--- mod_proxy.c 1997/04/28 03:47:08 1.11
***************
*** 351,360 ****
new = push_array (conf->noproxies);
new->name = arg;
/* Don't do name lookups on things that aren't dotted */
! if (strchr(arg, '.') != NULL) {
! proxy_host2addr(new->name, &hp);
memcpy(&new->addr, hp.h_addr, sizeof(struct in_addr));
- }
else
new->addr.s_addr = 0;
}
--- 351,358 ----
new = push_array (conf->noproxies);
new->name = arg;
/* Don't do name lookups on things that aren't dotted */
! if (strchr(arg, '.') != NULL && proxy_host2addr(new->name, &hp) == NULL)
memcpy(&new->addr, hp.h_addr, sizeof(struct in_addr));
else
new->addr.s_addr = 0;
}
***************
*** 492,499 ****
new = push_array (conf->nocaches);
new->name = arg;
/* Don't do name lookups on things that aren't dotted */
! if (strchr(arg, '.') != NULL) {
! proxy_host2addr(new->name, &hp);
memcpy(&new->addr, hp.h_addr, sizeof(struct in_addr));
}
else
--- 490,496 ----
new = push_array (conf->nocaches);
new->name = arg;
/* Don't do name lookups on things that aren't dotted */
! if (strchr(arg, '.') != NULL && proxy_host2addr(new->name, &hp) == NULL)
memcpy(&new->addr, hp.h_addr, sizeof(struct in_addr));
}
else
