mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use CONNECTION_OK to determine whether startup phase is complete.

Browse Source
This commit is contained in:
Peter Eisentraut 2001-07-06 19:04:23 +00:00
parent 4fc5b32b4b
commit 1e9e5defc2
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/interfaces/libpq/fe-connect.c
View File

@ -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 @@ keep_going: /* We will come back to here until there
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)
{
/*

3
src/interfaces/libpq/libpq-int.h
View File

@ -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.