Commit 2f473926 authored by Tony Finch's avatar Tony Finch
Browse files

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 <dduvall@eng.sun.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87938 13f79535-47bb-0310-9956-ffa450edef68
parent ef36765c
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
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 <dduvall@eng.sun.com>]

  *) Make mod_cgid work with SuExec.  [Ryan Bloom]

  *) Adopt apr user/group name features for mod_rewrite.  Eliminates some
+1 −1
Original line number Diff line number Diff line
@@ -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 */