database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-12 05:01:15 +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

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

@@ -11,7 +11,7 @@
*
*
* 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
*
@@ -129,7 +129,7 @@ static Dllist *BackendList;
/* list of ports associated with still open, but incomplete connections */
static Dllist *PortList;
int PostPortName = DEF_PGPORT;
int PostPortName;
/*
* This is a boolean indicating that there is at least one backend that
@@ -381,6 +381,9 @@ PostmasterMain(int argc, char *argv[])
MyProcPid = getpid();
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
* 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
*/