Commit 224b46dd authored by David Reid's avatar David Reid
Browse files

This stops a segfault on my machine where I haven't got a hostname for 

the function to find.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87586 13f79535-47bb-0310-9956-ffa450edef68
parent a93fbff3

server/util.c

+2 −2
Original line number Diff line number Diff line
@@ -1875,7 +1875,7 @@ char *ap_get_local_host(apr_pool_t *a) 
    if (gethostname(str, sizeof(str) - 1) != 0)

#endif

    {

        ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_WARNING, 0, NULL,

        ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_WARNING, 0, a,

                     "%s: gethostname() failed to determine ServerName",

                     ap_server_argv0);

    }
@@ -1900,7 +1900,7 @@ char *ap_get_local_host(apr_pool_t *a) 
    if (!server_hostname) 

        server_hostname = apr_pstrdup(a, "127.0.0.1");



    ap_log_error(APLOG_MARK, APLOG_ALERT|APLOG_NOERRNO|APLOG_STARTUP, 0, NULL,

    ap_log_error(APLOG_MARK, APLOG_ALERT|APLOG_NOERRNO|APLOG_STARTUP, 0, a,

                 "%s: Could not determine the server's fully qualified "

                 "domain name, using %s for ServerName",

                 ap_server_argv0, server_hostname);