postgres.git / summary / log / commit / refs

commit    77035fa8a92d8c39f4c689e54f46813f203f09a8
Author:   Fujii Masao <fujii@postgresql.org>
Date:     Thu Jan 23 13:48:12 2014 +0000
First released in: 9.4.0, 8.4.20, 9.0.16, 9.1.12, 9.2.7, 9.3.3

    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.


 src/interfaces/libpq/fe-connect.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index fa88c874945..92cdd2cbe35 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -5188,7 +5188,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 *


[parent: 90afc7d80565]