Commit1e9e5de

committed

Use CONNECTION_OK to determine whether startup phase is complete.

1 parent4fc5b32 commit1e9e5deCopy full SHA for 1e9e5de

File tree

-6

lines changed

-6

lines changed

Lines changed: 2 additions & 4 deletions

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/0617:58:53 petere Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.166 2001/07/0619: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`	`returnconn;`
`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`	`/*`

Lines changed: 1 addition & 2 deletions

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/0617:58:53 petere Exp $`
	`15`	`+ * $Id: libpq-int.h,v 1.35 2001/07/0619:04:23 petere Exp $`
`16`	`16`	`*`
`17`	`17`	`*-------------------------------------------------------------------------`
`18`	`18`	`*/`
`@@ -278,7 +278,6 @@ struct pg_conn`
`278`	`278`	`PQExpBufferDataworkBuffer;/* expansible string */`
`279`	`279`
`280`	`280`	`intclient_encoding;/* encoding id */`
`281`		`-intstartup_complete;`
`282`	`281`	`};`
`283`	`282`
`284`	`283`	`/* String descriptions of the ExecStatusTypes.`

Comments

(0)