Commitb93827c

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 parentbf723a2 commitb93827cCopy full SHA for b93827c

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
`@@ -688,11 +688,13 @@ be_tls_read(Port port, void ptr, size_t len, int *waitfor)`
`688`	`688`	`ereport(COMMERROR,`
`689`	`689`	`(errcode(ERRCODE_PROTOCOL_VIOLATION),`
`690`	`690`	`errmsg("SSL error: %s",SSLerrmessage(ecode))));`
`691`		`-/* fall through */`
`692`		`-caseSSL_ERROR_ZERO_RETURN:`
`693`	`691`	`errno=ECONNRESET;`
`694`	`692`	`n=-1;`
`695`	`693`	`break;`
	`694`	`+caseSSL_ERROR_ZERO_RETURN:`
	`695`	`+/* connection was cleanly shut down by peer */`
	`696`	`+n=0;`
	`697`	`+break;`
`696`	`698`	`default:`
`697`	`699`	`ereport(COMMERROR,`
`698`	`700`	`(errcode(ERRCODE_PROTOCOL_VIOLATION),`
`@@ -748,8 +750,14 @@ be_tls_write(Port port, void ptr, size_t len, int *waitfor)`
`748`	`750`	`ereport(COMMERROR,`
`749`	`751`	`(errcode(ERRCODE_PROTOCOL_VIOLATION),`
`750`	`752`	`errmsg("SSL error: %s",SSLerrmessage(ecode))));`
`751`		`-/* fall through */`
	`753`	`+errno=ECONNRESET;`
	`754`	`+n=-1;`
	`755`	`+break;`
`752`	`756`	`caseSSL_ERROR_ZERO_RETURN:`
	`757`	`+/*`
	`758`	`+ * the SSL connnection was closed, leave it to the caller`
	`759`	`+ * to ereport it`
	`760`	`+ */`
`753`	`761`	`errno=ECONNRESET;`
`754`	`762`	`n=-1;`
`755`	`763`	`break;`

Comments

(0)