Commit4032a51

committed

PGPORT envar was erroneously ignored by the backend

1 parentbeb7f7f commit4032a51Copy full SHA for 4032a51

File tree

-21

lines changed

-21

lines changed

Lines changed: 1 addition & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`* Portions Copyright (c) 1996-2000, PostgreSQL, Inc`
`30`	`30`	`* Portions Copyright (c) 1994, Regents of the University of California`
`31`	`31`	`*`
`32`		`- *$Id: pqcomm.c,v 1.95 2000/06/04 01:44:30 petere Exp $`
	`32`	`+ *$Id: pqcomm.c,v 1.96 2000/06/06 16:04:29 petere Exp $`
`33`	`33`	`*`
`34`	`34`	`*-------------------------------------------------------------------------`
`35`	`35`	`*/`
`@@ -118,19 +118,6 @@ pq_init(void)`
`118`	`118`	`debug_port=stderr;`
`119`	`119`	`}`
`120`	`120`
`121`		`-/* --------------------------------`
`122`		`- *pq_getport - return the PGPORT setting`
`123`		`- * --------------------------------`
`124`		`- */`
`125`		`-int`
`126`		`-pq_getport(void)`
`127`		`-{`
`128`		`-char*envport=getenv("PGPORT");`
`129`		`-`
`130`		`-if (envport)`
`131`		`-returnatoi(envport);`
`132`		`-returnDEF_PGPORT;`
`133`		`-}`
`134`	`121`
`135`	`122`	`/* --------------------------------`
`136`	`123`	`*pq_close - shutdown libpq at backend exit`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.146 2000/06/04 01:44:31 petere Exp $`
	`14`	`+ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.147 2000/06/06 16:04:29 petere Exp $`
`15`	`15`	`*`
`16`	`16`	`* NOTES`
`17`	`17`	`*`
`@@ -129,7 +129,7 @@ static Dllist *BackendList;`
`129`	`129`	`/* list of ports associated with still open, but incomplete connections */`
`130`	`130`	`staticDllist*PortList;`
`131`	`131`
`132`		`-intPostPortName=DEF_PGPORT;`
	`132`	`+intPostPortName;`
`133`	`133`
`134`	`134`	`/*`
`135`	`135`	`* This is a boolean indicating that there is at least one backend that`
`@@ -381,6 +381,9 @@ PostmasterMain(int argc, char *argv[])`
`381`	`381`	`MyProcPid=getpid();`
`382`	`382`	`DataDir=getenv("PGDATA");/* default value */`
`383`	`383`
	`384`	`+if (getenv("PGPORT"))`
	`385`	`+PostPortName=atoi(getenv("PGPORT"));`
	`386`	`+`
`384`	`387`	`/*`
`385`	`388`	`* First we must scan for a -D argument to get the data dir. Then`
`386`	`389`	`* read the config file. Finally, scan all the other arguments.`
`@@ -543,9 +546,6 @@ PostmasterMain(int argc, char *argv[])`
`543`	`546`	`}`
`544`	`547`	`}`
`545`	`548`
`546`		`-if (PostPortName==0)`
`547`		`-PostPortName=pq_getport();`
`548`		`-`
`549`	`549`	`/*`
`550`	`550`	`* Check for invalid combinations of switches`
`551`	`551`	`*/`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1996-2000, PostgreSQL, Inc`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`		`- * $Id: libpq.h,v 1.37 2000/06/04 01:44:37 petere Exp $`
	`10`	`+ * $Id: libpq.h,v 1.38 2000/06/06 16:04:32 petere Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -240,7 +240,6 @@ extern intStreamServerPort(int family, unsigned short portName, int *fdP);`
`240`	`240`	`externintStreamConnection(intserver_fd,Port*port);`
`241`	`241`	`externvoidStreamClose(intsock);`
`242`	`242`	`externvoidpq_init(void);`
`243`		`-externintpq_getport(void);`
`244`	`243`	`externvoidpq_close(void);`
`245`	`244`	`externintpq_getbytes(char*s,size_tlen);`
`246`	`245`	`externintpq_getstring(StringInfos);`

Comments

(0)