Commit 77035fa8 authored by Fujii Masao's avatar Fujii Masao

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.
parent 90afc7d8
......@@ -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 *
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment