Ensure that we always return a FQDN... This is not guaranteed by either

apr_sockaddr_info_get() or apr_getnameinfo(). Also note that under
OS X, apr_getnameinfo() always seems to fail (at least on my
machines) so if we don't specific ServerName at the global setting,
we get a warning.

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

diff --git a/server/util.c b/server/util.c
index 6adb1e216965cd6aabc51e62b04b4cd19e34a0c0..f506423b24540018f6cdfc836feed09688df66dd 100644 (file)
--- a/server/util.c
+++ b/server/util.c
@@ -1977,6 +1977,9 @@ AP_DECLARE(void) ap_str_tolower(char *str)
     }
 }
 
+/*
+ * We must return a FQDN
+ */
 char *ap_get_local_host(apr_pool_t *a)
 {
 #ifndef MAXHOSTNAMELEN
@@ -1985,6 +1988,7 @@ char *ap_get_local_host(apr_pool_t *a)
     char str[MAXHOSTNAMELEN + 1];
     char *server_hostname = NULL;
     apr_sockaddr_t *sockaddr;
+    char *hostname;
 
     if (apr_gethostname(str, sizeof(str) - 1, a) != APR_SUCCESS) {
         ap_log_perror(APLOG_MARK, APLOG_STARTUP | APLOG_WARNING, 0, a,
@@ -1992,14 +1996,21 @@ char *ap_get_local_host(apr_pool_t *a)
                      ap_server_argv0);
     } else {
         str[sizeof(str) - 1] = '\0';
-        if (apr_sockaddr_info_get(&sockaddr, str, AF_INET, 0, 0, a) == APR_SUCCESS) {
-            server_hostname = apr_pstrdup(a, sockaddr->hostname);
-            return server_hostname;
+        if (apr_sockaddr_info_get(&sockaddr, str, APR_UNSPEC, 0, 0, a) == APR_SUCCESS) {
+            if ( (apr_getnameinfo(&hostname, sockaddr, 0) == APR_SUCCESS) &&
+                (ap_strchr_c(hostname, '.')) ) {
+                server_hostname = apr_pstrdup(a, hostname);
+                return server_hostname;
+            } else if (ap_strchr_c(str, '.')) {
+                server_hostname = apr_pstrdup(a, str);
+            } else {
+                apr_sockaddr_ip_get(&hostname, sockaddr);
+                server_hostname = apr_pstrdup(a, hostname);
+            }
         } else {
             ap_log_perror(APLOG_MARK, APLOG_STARTUP | APLOG_WARNING, 0, a,
-                         "%s: apr_sockaddr_info_get() failed for hostname '%s'",
+                         "%s: apr_sockaddr_info_get() failed for %s",
                          ap_server_argv0, str);
-            server_hostname = apr_pstrdup(a, str);
         }
     }
 
@@ -2007,7 +2018,7 @@ char *ap_get_local_host(apr_pool_t *a)
         server_hostname = apr_pstrdup(a, "127.0.0.1");
 
     ap_log_perror(APLOG_MARK, APLOG_ALERT|APLOG_STARTUP, 0, a,
-                 "%s: Could not determine the server's fully qualified "
+                 "%s: Could not reliably determine the server's fully qualified "
                  "domain name, using %s for ServerName",
                  ap_server_argv0, server_hostname);