Commitf733828

committed

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

If the client closes an SSL connection, treat it the same as EOF on anon-SSL connection. In particular, don't write a message in the log aboutthat.Michael Paquier.Discussion:https://www.postgresql.org/message-id/CAB7nPqSfyVV42Q2acFo%3DvrvF2gxoZAMJLAPq3S3KkjhZAYi7aw@mail.gmail.com

1 parente9d4aa5 commitf733828Copy full SHA for f733828

File tree

+11

-3

lines changed

+11

-3

lines changed

Lines changed: 11 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -582,11 +582,13 @@ be_tls_read(Port port, void ptr, size_t len, int *waitfor)`
`582`	`582`	`ereport(COMMERROR,`
`583`	`583`	`(errcode(ERRCODE_PROTOCOL_VIOLATION),`
`584`	`584`	`errmsg("SSL error: %s",SSLerrmessage(ecode))));`
`585`		`-/* fall through */`
`586`		`-caseSSL_ERROR_ZERO_RETURN:`
`587`	`585`	`errno=ECONNRESET;`
`588`	`586`	`n=-1;`
`589`	`587`	`break;`
	`588`	`+caseSSL_ERROR_ZERO_RETURN:`
	`589`	`+/* connection was cleanly shut down by peer */`
	`590`	`+n=0;`
	`591`	`+break;`
`590`	`592`	`default:`
`591`	`593`	`ereport(COMMERROR,`
`592`	`594`	`(errcode(ERRCODE_PROTOCOL_VIOLATION),`
`@@ -642,8 +644,14 @@ be_tls_write(Port port, void ptr, size_t len, int *waitfor)`
`642`	`644`	`ereport(COMMERROR,`
`643`	`645`	`(errcode(ERRCODE_PROTOCOL_VIOLATION),`
`644`	`646`	`errmsg("SSL error: %s",SSLerrmessage(ecode))));`
`645`		`-/* fall through */`
	`647`	`+errno=ECONNRESET;`
	`648`	`+n=-1;`
	`649`	`+break;`
`646`	`650`	`caseSSL_ERROR_ZERO_RETURN:`
	`651`	`+/*`
	`652`	`+ * the SSL connnection was closed, leave it to the caller`
	`653`	`+ * to ereport it`
	`654`	`+ */`
`647`	`655`	`errno=ECONNRESET;`
`648`	`656`	`n=-1;`
`649`	`657`	`break;`

Comments

(0)