1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove redundant logging of send failures when SSL is in use. While pqcomm.c

Browse Source 
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.
This commit is contained in:
Tom Lane 2007-05-18 01:20:48 +00:00
parent 7ee0498772
commit 81df147acb
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/backend/libpq/be-secure.c
View File

@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/libpq/be-secure.c,v 1.43.2.3 2006/05/12 22:44:58 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/libpq/be-secure.c,v 1.43.2.4 2007/05/18 01:20:48 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
@ -269,15 +269,9 @@ rloop:
case SSL_ERROR_WANT_WRITE: case SSL_ERROR_WANT_WRITE:
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;
} }
@ -360,15 +354,9 @@ wloop:
case SSL_ERROR_WANT_WRITE: case SSL_ERROR_WANT_WRITE:
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;
} }