]> granicus.if.org Git - apache/commitdiff
This stops a segfault on my machine where I haven't got a hostname for
authorDavid Reid <dreid@apache.org>
Thu, 4 Jan 2001 21:53:27 +0000 (21:53 +0000)
committerDavid Reid <dreid@apache.org>
Thu, 4 Jan 2001 21:53:27 +0000 (21:53 +0000)
the function to find.

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

server/util.c

index 16bedc588b8ca79010654e0121d88e56b9330db6..5c92f5e070f7bca34acdf07daf5ce7c96f620a93 100644 (file)
@@ -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);