Commit d1972c52 authored by Tom Lane's avatar Tom Lane

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.
parent 16b52543
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * 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) * Since the server static private key ($DataDir/server.key)
* will normally be stored unencrypted so that the database * will normally be stored unencrypted so that the database
...@@ -287,15 +287,9 @@ rloop: ...@@ -287,15 +287,9 @@ rloop:
#endif #endif
goto rloop; goto rloop;
case SSL_ERROR_SYSCALL: case SSL_ERROR_SYSCALL:
if (n == -1) /* leave it to caller to ereport the value of errno */
ereport(COMMERROR, if (n != -1)
(errcode_for_socket_access(),
errmsg("SSL SYSCALL error: %m")));
else
{ {
ereport(COMMERROR,
(errcode(ERRCODE_PROTOCOL_VIOLATION),
errmsg("SSL SYSCALL error: EOF detected")));
errno = ECONNRESET; errno = ECONNRESET;
n = -1; n = -1;
} }
...@@ -387,15 +381,9 @@ wloop: ...@@ -387,15 +381,9 @@ wloop:
#endif #endif
goto wloop; goto wloop;
case SSL_ERROR_SYSCALL: case SSL_ERROR_SYSCALL:
if (n == -1) /* leave it to caller to ereport the value of errno */
ereport(COMMERROR, if (n != -1)
(errcode_for_socket_access(),
errmsg("SSL SYSCALL error: %m")));
else
{ {
ereport(COMMERROR,
(errcode(ERRCODE_PROTOCOL_VIOLATION),
errmsg("SSL SYSCALL error: EOF detected")));
errno = ECONNRESET; errno = ECONNRESET;
n = -1; n = -1;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment