Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit ef54e0d

Browse files
committed
Remove remaining unixsocket-setting interfaces, since the host parameter
does that. Disable URL-style connection parameter specification code, which doesn't work.
1 parent 81c8c24 commit ef54e0d

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

src/interfaces/libpq/fe-connect.c

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.150 2000/11/28 06:53:33 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.151 2000/11/30 18:32:52 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -130,9 +130,6 @@ static const PQconninfoOption PQconninfoOptions[] = {
130130
{"port", "PGPORT", DEF_PGPORT_STR, NULL,
131131
"Database-Port", "", 6},
132132

133-
{"unixsocket", "PGUNIXSOCKET", NULL, NULL,
134-
"Unix-Socket", "", 80},
135-
136133
{"tty", "PGTTY", DefaultTty, NULL,
137134
"Backend-Debug-TTY", "D", 40},
138135

@@ -308,8 +305,6 @@ PQconnectStart(const char *conninfo)
308305
conn->pghost = tmp ? strdup(tmp) : NULL;
309306
tmp = conninfo_getval(connOptions, "port");
310307
conn->pgport = tmp ? strdup(tmp) : NULL;
311-
tmp = conninfo_getval(connOptions, "unixsocket");
312-
conn->pgunixsocket = tmp ? strdup(tmp) : NULL;
313308
tmp = conninfo_getval(connOptions, "tty");
314309
conn->pgtty = tmp ? strdup(tmp) : NULL;
315310
tmp = conninfo_getval(connOptions, "options");
@@ -402,9 +397,6 @@ PQconndefaults(void)
402397
* PGPORT identifies TCP port to which to connect if <pgport> argument
403398
* is NULL or a null string.
404399
*
405-
* PGUNIXSOCKET identifies Unix-domain socket to which to connect; default
406-
* is computed from the TCP port.
407-
*
408400
* PGTTY identifies tty to which to send messages if <pgtty> argument
409401
* is NULL or a null string.
410402
*
@@ -541,6 +533,7 @@ PQsetdbLogin(const char *pghost, const char *pgport, const char *pgoptions,
541533
}
542534

543535

536+
#ifdef NOT_USED /* because it's broken */
544537
/*
545538
* update_db_info -
546539
* get all additional info out of dbName
@@ -689,6 +682,8 @@ update_db_info(PGconn *conn)
689682

690683
return 0;
691684
}
685+
#endif /* NOT_USED */
686+
692687

693688
/* ----------
694689
* connectMakeNonblocking -
@@ -768,11 +763,13 @@ connectDBStart(PGconn *conn)
768763
if (!conn)
769764
return 0;
770765

766+
#ifdef NOT_USED
771767
/*
772768
* parse dbName to get all additional info in it, if any
773769
*/
774770
if (update_db_info(conn) != 0)
775771
goto connect_errReturn;
772+
#endif
776773

777774
/* Ensure our buffers are empty */
778775
conn->inStart = conn->inCursor = conn->inEnd = 0;

0 commit comments

Comments
 (0)