Use CONNECTION_OK to determine whether startup phase is complete.

petere · petere · commit 1e9e5defc256 · 2001-07-06T19:04:23.000Z
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.165 2001/07/06 17:58:53 petere Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.166 2001/07/06 19:04:23 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1409,7 +1409,6 @@ PQconnectPoll(PGconn *conn)
 				if (areq == AUTH_REQ_OK)
 				{
 					/* We are done with authentication exchange */
-					conn->startup_complete = TRUE;
 					conn->status = CONNECTION_AUTH_OK;
 
 					/*
@@ -1910,7 +1909,6 @@ makeEmptyPGconn(void)
 		freePGconn(conn);
 		conn = NULL;
 	}
-	conn->startup_complete = FALSE;
 	return conn;
 }
 
@@ -1976,7 +1974,7 @@ closePGconn(PGconn *conn)
 {
 	/* Note that the protocol doesn't allow us to send Terminate
        messages during the startup phase. */
-	if (conn->sock >= 0 && conn->startup_complete)
+	if (conn->sock >= 0 && conn->status == CONNECTION_OK)
 	{
 
 		/*
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
@@ -12,7 +12,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: libpq-int.h,v 1.34 2001/07/06 17:58:53 petere Exp $
+ * $Id: libpq-int.h,v 1.35 2001/07/06 19:04:23 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -278,7 +278,6 @@ struct pg_conn
 	PQExpBufferData workBuffer; /* expansible string */
 
 	int			client_encoding;/* encoding id */
-	int			startup_complete;
 };
 
 /* String descriptions of the ExecStatusTypes.

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.165 2001/07/06 17:58:53 petere Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.166 2001/07/06 19:04:23 petere Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -1409,7 +1409,6 @@ PQconnectPoll(PGconn *conn)`
`1409`	`1409`	`if (areq == AUTH_REQ_OK)`
`1410`	`1410`	`{`
`1411`	`1411`	`/* We are done with authentication exchange */`
`1412`		`- conn->startup_complete = TRUE;`
`1413`	`1412`	`conn->status = CONNECTION_AUTH_OK;`
`1414`	`1413`
`1415`	`1414`	`/*`
`@@ -1910,7 +1909,6 @@ makeEmptyPGconn(void)`
`1910`	`1909`	`freePGconn(conn);`
`1911`	`1910`	`conn = NULL;`
`1912`	`1911`	`}`
`1913`		`- conn->startup_complete = FALSE;`
`1914`	`1912`	`return conn;`
`1915`	`1913`	`}`
`1916`	`1914`
`@@ -1976,7 +1974,7 @@ closePGconn(PGconn *conn)`
`1976`	`1974`	`{`
`1977`	`1975`	`/* Note that the protocol doesn't allow us to send Terminate`
`1978`	`1976`	`messages during the startup phase. */`
`1979`		`- if (conn->sock >= 0 && conn->startup_complete)`
	`1977`	`+ if (conn->sock >= 0 && conn->status == CONNECTION_OK)`
`1980`	`1978`	`{`
`1981`	`1979`
`1982`	`1980`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group`
`13`	`13`	`* Portions Copyright (c) 1994, Regents of the University of California`
`14`	`14`	`*`
`15`		`- * $Id: libpq-int.h,v 1.34 2001/07/06 17:58:53 petere Exp $`
	`15`	`+ * $Id: libpq-int.h,v 1.35 2001/07/06 19:04:23 petere Exp $`
`16`	`16`	`*`
`17`	`17`	`*-------------------------------------------------------------------------`
`18`	`18`	`*/`
`@@ -278,7 +278,6 @@ struct pg_conn`
`278`	`278`	`PQExpBufferData workBuffer; /* expansible string */`
`279`	`279`
`280`	`280`	`int client_encoding;/* encoding id */`
`281`		`- int startup_complete;`
`282`	`281`	`};`
`283`	`282`
`284`	`283`	`/* String descriptions of the ExecStatusTypes.`