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 4981ad52a156fba0f8d6e603a3240dc1af2f190b..e0636167f4d9a11537cf579b7d040f3f0b5058a2 100644 (file)
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -3520,7 +3520,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 *