aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2007-05-18 01:20:16 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2007-05-18 01:20:16 +0000
commitd1972c52a899c42d3253591db9e23601fc6e6ce8 (patch)
tree9f1ae99f80371e068603a39754d6bd16a0cabf05
parent16b52543185ec3f195472a56cebabce41d2f0f01 (diff)
downloadpostgresql-d1972c52a899c42d3253591db9e23601fc6e6ce8.tar.gz
postgresql-d1972c52a899c42d3253591db9e23601fc6e6ce8.zip
Remove redundant logging of send failures when SSL is in use. While pqcomm.c
had been taught not to do that ages ago, the SSL code was helpfully bleating anyway. Resolves some recent reports such as bug #3266; however the underlying cause of the related bug #2829 is still unclear.
-rw-r--r--src/backend/libpq/be-secure.c22
1 files changed, 5 insertions, 17 deletions
diff --git a/src/backend/libpq/be-secure.c b/src/backend/libpq/be-secure.c
index 2eb68f22551..dfff484db83 100644
--- a/src/backend/libpq/be-secure.c
+++ b/src/backend/libpq/be-secure.c
@@ -11,7 +11,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/libpq/be-secure.c,v 1.79 2007/02/16 17:06:59 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/libpq/be-secure.c,v 1.80 2007/05/18 01:20:16 tgl Exp $
*
* Since the server static private key ($DataDir/server.key)
* will normally be stored unencrypted so that the database
@@ -287,15 +287,9 @@ rloop:
#endif
goto rloop;
case SSL_ERROR_SYSCALL:
- if (n == -1)
- ereport(COMMERROR,
- (errcode_for_socket_access(),
- errmsg("SSL SYSCALL error: %m")));
- else
+ /* leave it to caller to ereport the value of errno */
+ if (n != -1)
{
- ereport(COMMERROR,
- (errcode(ERRCODE_PROTOCOL_VIOLATION),
- errmsg("SSL SYSCALL error: EOF detected")));
errno = ECONNRESET;
n = -1;
}
@@ -387,15 +381,9 @@ wloop:
#endif
goto wloop;
case SSL_ERROR_SYSCALL:
- if (n == -1)
- ereport(COMMERROR,
- (errcode_for_socket_access(),
- errmsg("SSL SYSCALL error: %m")));
- else
+ /* leave it to caller to ereport the value of errno */
+ if (n != -1)
{
- ereport(COMMERROR,
- (errcode(ERRCODE_PROTOCOL_VIOLATION),
- errmsg("SSL SYSCALL error: EOF detected")));
errno = ECONNRESET;
n = -1;
}