You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by fa...@apache.org on 2001/02/01 10:59:26 UTC
cvs commit: httpd-2.0/server util.c
fanf 01/02/01 01:59:26
Modified: . CHANGES
server util.c
Log:
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 <dd...@eng.sun.com>
Revision Changes Path
1.68 +5 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -u -r1.67 -r1.68
--- CHANGES 2001/01/29 05:41:00 1.67
+++ CHANGES 2001/02/01 09:59:22 1.68
@@ -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 <dd...@eng.sun.com>]
+
*) Make mod_cgid work with SuExec. [Ryan Bloom]
*) Adopt apr user/group name features for mod_rewrite. Eliminates some
1.97 +1 -1 httpd-2.0/server/util.c
Index: util.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/util.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -u -r1.96 -r1.97
--- util.c 2001/01/27 21:28:26 1.96
+++ util.c 2001/02/01 09:59:25 1.97
@@ -1798,7 +1798,7 @@
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 */