From e3a8299522bcd06a73b2c80ecdc5e978c0b0bc4b Mon Sep 17 00:00:00 2001 From: David Reid Date: Sat, 18 Nov 2000 16:04:06 +0000 Subject: [PATCH] Change references of AF_ to reflect APR_ so they should work on all systems. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87012 13f79535-47bb-0310-9956-ffa450edef68 --- server/rfc1413.c | 2 +- server/util.c | 2 +- server/vhost.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/rfc1413.c b/server/rfc1413.c index bafd9bd9a5..de545b910a 100644 --- a/server/rfc1413.c +++ b/server/rfc1413.c @@ -139,7 +139,7 @@ static int get_rfc1413(apr_socket_t *sock, apr_pool_t *p, return -1; } - if ((status = apr_getaddrinfo(&destsa, rmt_ip, AF_INET, RFC1413_PORT, 0, + if ((status = apr_getaddrinfo(&destsa, rmt_ip, APR_INET, RFC1413_PORT, 0, p)) != APR_SUCCESS) { /* This should not fail since we have a numeric address string * as the host. */ diff --git a/server/util.c b/server/util.c index 2cd50866c2..a05443f25e 100644 --- a/server/util.c +++ b/server/util.c @@ -1876,7 +1876,7 @@ unsigned long ap_get_virthost_addr(char *w, apr_port_t *ports) hep = gethostbyname(w); - if ((!hep) || (hep->h_addrtype != AF_INET || !hep->h_addr_list[0])) { + if ((!hep) || (hep->h_addrtype != APR_INET || !hep->h_addr_list[0])) { ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "Cannot resolve host name %s --- exiting!", w); exit(1); } diff --git a/server/vhost.c b/server/vhost.c index 69fb6fb5cf..950f90863e 100644 --- a/server/vhost.c +++ b/server/vhost.c @@ -636,7 +636,7 @@ void ap_fini_vhost_config(apr_pool_t *p, server_rec *main_s) struct hostent *h; if ((h = gethostbyaddr((char *) &(s->addrs->host_addr), - sizeof(struct in_addr), AF_INET))) { + sizeof(struct in_addr), APR_INET))) { s->server_hostname = apr_pstrdup(p, (char *) h->h_name); } else { -- 2.50.1