From: Tony Finch Date: Thu, 1 Feb 2001 09:59:25 +0000 (+0000) Subject: Get the correct IP address if ServerName isn't set and we can't X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2f473926ef86c69dd43edfae0fa33b2ba9693eb6;p=apache Get the correct IP address if ServerName isn't set and we can't find a fully-qualified domain name at startup. PR: 7170 Submitted by: Danek Duvall git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87938 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index 1828259fdd..05b67886e4 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,9 @@ Changes with Apache 2.0b1 + + *) Get the correct IP address if ServerName isn't set and we can't + find a fully-qualified domain name at startup. + PR#7170 [Danek Duvall ] + *) Make mod_cgid work with SuExec. [Ryan Bloom] *) Adopt apr user/group name features for mod_rewrite. Eliminates some diff --git a/server/util.c b/server/util.c index 3e9d7a1d3c..9ca1eb0f22 100644 --- a/server/util.c +++ b/server/util.c @@ -1798,7 +1798,7 @@ char *ap_get_local_host(apr_pool_t *a) if ((!(p = gethostbyname(str))) || (!(server_hostname = find_fqdn(a, p)))) { /* Recovery - return the default servername by IP: */ - if (!str && p->h_addr_list[0]) { + if (p->h_addr_list[0]) { apr_snprintf(str, sizeof(str), "%pA", p->h_addr_list[0]); server_hostname = apr_pstrdup(a, str); /* We will drop through to report the IP-named server */