Treat clean shutdown of an SSL connection same as the non-SSL case.

hlinnaka · hlinnaka · commit fb63a0aa3388 · 2017-07-03T14:53:08.000+03:00
If the client closes an SSL connection, treat it the same as EOF on a non-SSL connection. In particular, don't write a message in the log about that. Michael Paquier. Discussion: https://www.postgresql.org/message-id/CAB7nPqSfyVV42Q2acFo%3DvrvF2gxoZAMJLAPq3S3KkjhZAYi7aw@mail.gmail.com
diff --git a/src/backend/libpq/be-secure.c b/src/backend/libpq/be-secure.c
@@ -298,11 +298,13 @@ secure_read(Port *port, void *ptr, size_t len)
 				ereport(COMMERROR,
 						(errcode(ERRCODE_PROTOCOL_VIOLATION),
 						 errmsg("SSL error: %s", SSLerrmessage(ecode))));
-				/* fall through */
-			case SSL_ERROR_ZERO_RETURN:
 				errno = ECONNRESET;
 				n = -1;
 				break;
+			case SSL_ERROR_ZERO_RETURN:
+				/* connection was cleanly shut down by peer */
+				n = 0;
+				break;
 			default:
 				ereport(COMMERROR,
 						(errcode(ERRCODE_PROTOCOL_VIOLATION),
@@ -423,8 +425,14 @@ secure_write(Port *port, void *ptr, size_t len)
 				ereport(COMMERROR,
 						(errcode(ERRCODE_PROTOCOL_VIOLATION),
 						 errmsg("SSL error: %s", SSLerrmessage(ecode))));
-				/* fall through */
+				errno = ECONNRESET;
+				n = -1;
+				break;
 			case SSL_ERROR_ZERO_RETURN:
+				/*
+				 * the SSL connnection was closed, leave it to the caller
+				 * to ereport it
+				 */
 				errno = ECONNRESET;
 				n = -1;
 				break;
