Fix bugs in PQhost().

In the platform that doesn't support Unix-domain socket, when
neither host nor hostaddr are specified, the default host
'localhost' is used to connect to the server and PQhost() must
return that, but it didn't. This patch fixes PQhost() so that
it returns the default host in that case.

Also this patch fixes PQhost() so that it doesn't return
Unix-domain socket directory path in the platform that doesn't
support Unix-domain socket.

Back-patch to all supported versions.

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index ab427c1964b3ad10cac49dc6084b504b4319e3ee..bd23e9d143446eec24e60ae97a77fa10f861ed56 100644 (file)
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -4522,7 +4522,16 @@ PQhost(const PGconn *conn)
 {
        if (!conn)
                return NULL;
-       return conn->pghost ? conn->pghost : conn->pgunixsocket;
+       if (conn->pghost != NULL && conn->pghost[0] != '\0')
+               return conn->pghost;
+       else
+       {
+#ifdef HAVE_UNIX_SOCKETS
+               return conn->pgunixsocket;
+#else
+               return DefaultHost;
+#endif
+       }
 }
 
 char *