PGPORT envar was erroneously ignored by the backend

petere · petere · commit 4032a515d26e · 2000-06-06T16:04:32.000Z
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
@@ -29,7 +29,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * 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;
 }
 
-/* --------------------------------
- *		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
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
@@ -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
 	 */
diff --git a/src/include/libpq/libpq.h b/src/include/libpq/libpq.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * 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 void StreamClose(int sock);
 extern void pq_init(void);
-extern int	pq_getport(void);
 extern void pq_close(void);
 extern int	pq_getbytes(char *s, size_t len);
 extern int	pq_getstring(StringInfo s);

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`	`static Dllist *PortList;`
`131`	`131`
`132`		`-int PostPortName = DEF_PGPORT;`
	`132`	`+int PostPortName;`
`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`	`*/`