]> granicus.if.org Git - postgresql/commitdiff
Backpatch SSL fixes into 7.3.1.
authorBruce Momjian <bruce@momjian.us>
Fri, 13 Dec 2002 22:20:22 +0000 (22:20 +0000)
committerBruce Momjian <bruce@momjian.us>
Fri, 13 Dec 2002 22:20:22 +0000 (22:20 +0000)
src/backend/libpq/be-secure.c

index 98ce0aa53397bcfb79d71e0618522fbddee75ba0..c603f0219b08a2156a46323f731927fb2f5a6293 100644 (file)
@@ -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());