postgres.git / summary / log / commit / refs
commit d1f35b73acafe991b8b6a129e49045cf5f81ad2e
Author: Tom Lane <tgl@sss.pgh.pa.us>
Date: Mon Aug 04 17:58:25 2003 +0000
First released in: 7.4, 7.3.5
SSL_read/SSL_write do not approximate the return conventions of recv()
and send() very well at all; and in any case we can't use retval==0
for EOF due to race conditions. Make the same fixes in the backend as
are required in libpq.
src/backend/libpq/be-secure.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/backend/libpq/be-secure.c b/src/backend/libpq/be-secure.c
index 42e5fbdc214..fbd8fe4d7fd 100644
--- a/src/backend/libpq/be-secure.c
+++ b/src/backend/libpq/be-secure.c
@@ -11,7 +11,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/be-secure.c,v 1.15.2.11 2003/04/10 23:03:13 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/be-secure.c,v 1.15.2.12 2003/08/04 17:58:25 tgl Exp $
*
* Since the server static private key ($DataDir/server.key)
* will normally be stored unencrypted so that the database
@@ -287,18 +287,22 @@ secure_read(Port *port, void *ptr, size_t len)
if (n == -1)
elog(COMMERROR, "SSL SYSCALL error: %m");
else
+ {
elog(COMMERROR, "SSL SYSCALL error: EOF detected");
+ errno = ECONNRESET;
+ n = -1;
+ }
break;
case SSL_ERROR_SSL:
elog(COMMERROR, "SSL error: %s", SSLerrmessage());
/* fall through */
case SSL_ERROR_ZERO_RETURN:
- secure_close(port);
errno = ECONNRESET;
n = -1;
break;
default:
elog(COMMERROR, "Unknown SSL error code");
+ n = -1;
break;
}
}
@@ -352,18 +356,22 @@ secure_write(Port *port, void *ptr, size_t len)
if (n == -1)
elog(COMMERROR, "SSL SYSCALL error: %m");
else
+ {
elog(COMMERROR, "SSL SYSCALL error: EOF detected");
+ errno = ECONNRESET;
+ n = -1;
+ }
break;
case SSL_ERROR_SSL:
elog(COMMERROR, "SSL error: %s", SSLerrmessage());
/* fall through */
case SSL_ERROR_ZERO_RETURN:
- secure_close(port);
errno = ECONNRESET;
n = -1;
break;
default:
elog(COMMERROR, "Unknown SSL error code");
+ n = -1;
break;
}
}
[parent: 5365a0cf5218]