Skip to content

Commit 1b384af

Browse files
committed
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.
1 parent cbd850b commit 1b384af

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

src/interfaces/libpq/fe-connect.c

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4522,7 +4522,16 @@ PQhost(const PGconn *conn)
45224522
{
45234523
if (!conn)
45244524
return NULL;
4525-
return conn->pghost ? conn->pghost : conn->pgunixsocket;
4525+
if (conn->pghost != NULL && conn->pghost[0] != '\0')
4526+
return conn->pghost;
4527+
else
4528+
{
4529+
#ifdef HAVE_UNIX_SOCKETS
4530+
return conn->pgunixsocket;
4531+
#else
4532+
return DefaultHost;
4533+
#endif
4534+
}
45264535
}
45274536

45284537
char *

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy