You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@locus.apache.org on 2000/07/17 23:20:44 UTC
cvs commit: apache-2.0/src/main util.c
trawick 00/07/17 14:20:44
Modified: src/main util.c
Log:
Grab OtherBill's latest 1.3 code to provide a default ServerName
and log the error.
Submitted by: "William A. Rowe, Jr." <wr...@lnd.com>
Revision Changes Path
1.61 +8 -5 apache-2.0/src/main/util.c
Index: util.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/util.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- util.c 2000/06/28 14:33:33 1.60
+++ util.c 2000/07/17 21:20:43 1.61
@@ -1904,18 +1904,21 @@
if (!str && p->h_addr_list[0]) {
ap_snprintf(str, sizeof(str), "%pA", p->h_addr_list[0]);
server_hostname = ap_pstrdup(a, str);
+ /* We will drop through to report the IP-named server */
}
}
+ else {
+ /* Since we found a fdqn, return it with no logged message. */
+ return server_hostname;
+ }
}
if (!server_hostname)
server_hostname = ap_pstrdup(a, "127.0.0.1");
- ap_log_error(APLOG_MARK, APLOG_ALERT | APLOG_NOERRNO, 0,
- NULL, "%s: Missing ServerName directive in httpd.conf.",
- ap_server_argv0);
- ap_log_error(APLOG_MARK, APLOG_ALERT | APLOG_NOERRNO, 0,
- NULL, "%s: assumed ServerName of %s",
+ ap_log_error(APLOG_MARK, APLOG_ALERT|APLOG_NOERRNO, 0, NULL,
+ "%s: Could not find determine the server's fully qualified "
+ "domain name, using %s for ServerName\n",
ap_server_argv0, server_hostname);
return server_hostname;