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.
REL9_1_STABLE
Fujii Masao 12 years ago
parent cbd850bf60
commit 1b384aff15
  1. 11
      src/interfaces/libpq/fe-connect.c

@ -4522,7 +4522,16 @@ PQhost(const PGconn *conn)
{ {
if (!conn) if (!conn)
return NULL; 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 * char *

Loading…
Cancel
Save