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.

diff --git a/src/backend/libpq/be-secure.c b/src/backend/libpq/be-secure.c
index d59e7bcfeeb1864108205ba7c1f8c2fdeedf80be..460304080fb5bb868b2ea156fa6ff3664fc76399 100644 (file)
--- a/src/backend/libpq/be-secure.c
+++ b/src/backend/libpq/be-secure.c
@@ -281,15 +281,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;
                                }
@@ -380,15 +374,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;
                                }