postgres.git / summary / log / commit / refs

commit    1b384aff158a840fed4e9f4f366ba8d7c6ed42fb
Author:   Fujii Masao <fujii@postgresql.org>
Date:     Thu Jan 23 14:01:34 2014 +0000

    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 ab427c1964b..bd23e9d1434 100644
--- 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 *


[parent: cbd850bf609c]