From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 13 Dec 2002 22:20:22 +0000 (+0000)
Subject: Backpatch SSL fixes into 7.3.1.
X-Git-Tag: REL7_3_1~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=77a9708f85128de2859ccf328baa422a16d9501c;p=postgresql

Backpatch SSL fixes into 7.3.1.
---

diff --git a/src/backend/libpq/be-secure.c b/src/backend/libpq/be-secure.c
index 98ce0aa533..c603f0219b 100644
--- a/src/backend/libpq/be-secure.c
+++ b/src/backend/libpq/be-secure.c
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/be-secure.c,v 1.15.2.1 2002/11/07 18:47:08 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/be-secure.c,v 1.15.2.2 2002/12/13 22:20:22 momjian Exp $
  *
  *	  Since the server static private key ($DataDir/server.key)
  *	  will normally be stored unencrypted so that the database
@@ -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());