database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-13 07:41:39 +03:00
Code Activity

PGPORT envar was erroneously ignored by the backend

Browse Source
This commit is contained in:
Peter Eisentraut
2000-06-06 16:04:32 +00:00
parent beb7f7f72d
commit 4032a515d2
3 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/backend/libpq/pqcomm.c
View File

@ -29,7 +29,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: pqcomm.c,v 1.95 2000/06/04 01:44:30 petere Exp $ * $Id: pqcomm.c,v 1.96 2000/06/06 16:04:29 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -118,19 +118,6 @@ pq_init(void)
debug_port = stderr; debug_port = stderr;
} }
/* --------------------------------
* pq_getport - return the PGPORT setting
* --------------------------------
*/
int
pq_getport(void)
{
char *envport = getenv("PGPORT");
if (envport)
return atoi(envport);
return DEF_PGPORT;
}
/* -------------------------------- /* --------------------------------
* pq_close - shutdown libpq at backend exit * pq_close - shutdown libpq at backend exit

10
src/backend/postmaster/postmaster.c
View File

@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.146 2000/06/04 01:44:31 petere Exp $ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.147 2000/06/06 16:04:29 petere Exp $
* *
* NOTES * NOTES
* *
@ -129,7 +129,7 @@ static Dllist *BackendList;
/* list of ports associated with still open, but incomplete connections */ /* list of ports associated with still open, but incomplete connections */
static Dllist *PortList; static Dllist *PortList;
int PostPortName = DEF_PGPORT; int PostPortName;
/* /*
* This is a boolean indicating that there is at least one backend that * This is a boolean indicating that there is at least one backend that
@ -381,6 +381,9 @@ PostmasterMain(int argc, char *argv[])
MyProcPid = getpid(); MyProcPid = getpid();
DataDir = getenv("PGDATA"); /* default value */ DataDir = getenv("PGDATA"); /* default value */
if (getenv("PGPORT"))
PostPortName = atoi(getenv("PGPORT"));
/* /*
* First we must scan for a -D argument to get the data dir. Then * First we must scan for a -D argument to get the data dir. Then
* read the config file. Finally, scan all the other arguments. * read the config file. Finally, scan all the other arguments.
@ -543,9 +546,6 @@ PostmasterMain(int argc, char *argv[])
} }
} }
if (PostPortName == 0)
PostPortName = pq_getport();
/* /*
* Check for invalid combinations of switches * Check for invalid combinations of switches
*/ */

3
src/include/libpq/libpq.h
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: libpq.h,v 1.37 2000/06/04 01:44:37 petere Exp $ * $Id: libpq.h,v 1.38 2000/06/06 16:04:32 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -240,7 +240,6 @@ extern int StreamServerPort(int family, unsigned short portName, int *fdP);
extern int StreamConnection(int server_fd, Port *port); extern int StreamConnection(int server_fd, Port *port);
extern void StreamClose(int sock); extern void StreamClose(int sock);
extern void pq_init(void); extern void pq_init(void);
extern int pq_getport(void);
extern void pq_close(void); extern void pq_close(void);
extern int pq_getbytes(char *s, size_t len); extern int pq_getbytes(char *s, size_t len);
extern int pq_getstring(StringInfo s); extern int pq_getstring(StringInfo s);