Backpatch SSL fixes into 7.3.1.

diff --git a/src/backend/libpq/be-secure.c b/src/backend/libpq/be-secure.c
index 37dea613f4ce4af9b7a2c07bd76bc7748e93d830..b8edc1cd6756aa7d1fcbcd8009f883f0e4b14282 100644 (file)
--- a/src/backend/libpq/be-secure.c
+++ b/src/backend/libpq/be-secure.c
@@ -288,7 +288,8 @@ secure_read(Port *port, void *ptr, size_t len)
                        case SSL_ERROR_WANT_READ:
                                break;
                        case SSL_ERROR_SYSCALL:
-                               elog(ERROR, "SSL SYSCALL error: %s", strerror(errno));
+                               if (n == -1)
+                                       elog(ERROR, "SSL SYSCALL error: %s", strerror(errno));
                                break;
                        case SSL_ERROR_SSL:
                                elog(ERROR, "SSL error: %s", SSLerrmessage());
@@ -337,7 +338,8 @@ secure_write(Port *port, const void *ptr, size_t len)
                        case SSL_ERROR_WANT_WRITE:
                                break;
                        case SSL_ERROR_SYSCALL:
-                               elog(ERROR, "SSL SYSCALL error: %s", strerror(errno));
+                               if (n == -1)
+                                       elog(ERROR, "SSL SYSCALL error: %s", strerror(errno));
                                break;
                        case SSL_ERROR_SSL:
                                elog(ERROR, "SSL error: %s", SSLerrmessage());