1
0
mirror of https://github.com/postgres/postgres.git synced 2025-09-02 04:21:28 +03:00

Clean up some problems in new asynchronous-connection logic

in libpq --- mostly, poor response to error conditions.  You now actually
get to see the postmaster's 'The Data Base System is starting up' message,
which you didn't before.  I suspect the SSL code is still broken though.
This commit is contained in:
Tom Lane
2000-01-14 05:33:15 +00:00
parent 0e6d72db55
commit 2af360ed1c
4 changed files with 160 additions and 178 deletions

View File

@@ -11,7 +11,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
* $Id: libpq-int.h,v 1.14 1999/11/30 03:08:19 momjian Exp $
* $Id: libpq-int.h,v 1.15 2000/01/14 05:33:15 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -27,10 +27,9 @@
/* include stuff found in fe only */
#include "pqexpbuffer.h"
#ifdef USE_SSL
#include "openssl/ssl.h"
#include "openssl/err.h"
#include <openssl/ssl.h>
#include <openssl/err.h>
#endif
/* libpq supports this version of the frontend/backend protocol.
@@ -63,7 +62,7 @@
/* Subsidiary-storage management structure for PGresult.
* See space management routines in fe-exec.c for details.
* Note that space[k] refers to the k'th byte starting from the physical
* head of the block.
* head of the block --- it's a union, not a struct!
*/
typedef union pgresult_data PGresult_data;
@@ -228,7 +227,8 @@ struct pg_conn
PGsetenvHandle setenv_handle;
#ifdef USE_SSL
SSL *ssl;
bool allow_ssl_try; /* Allowed to try SSL negotiation */
SSL *ssl; /* SSL status, if have SSL connection */
#endif
/* Buffer for current error message */