NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commitd1972c5

committed

Remove redundant logging of send failures when SSL is in use. While pqcomm.c

had been taught not to do that ages ago, the SSL code was helpfully bleatinganyway. Resolves some recent reports such as bug #3266; however theunderlying cause of the related bug #2829 is still unclear.

1 parent16b5254 commitd1972c5Copy full SHA for d1972c5

File tree

1 file changed

-17

lines changed

src/backend/libpq
- be-secure.c

1 file changed

-17

lines changed

`‎src/backend/libpq/be-secure.c`

Lines changed: 5 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $PostgreSQL: pgsql/src/backend/libpq/be-secure.c,v 1.79 2007/02/16 17:06:59 tgl Exp $`
	`14`	`+ * $PostgreSQL: pgsql/src/backend/libpq/be-secure.c,v 1.80 2007/05/18 01:20:16 tgl Exp $`
`15`	`15`	`*`
`16`	`16`	`* Since the server static private key ($DataDir/server.key)`
`17`	`17`	`* will normally be stored unencrypted so that the database`
`@@ -287,15 +287,9 @@ secure_read(Port port, void ptr, size_t len)`
`287`	`287`	`#endif`
`288`	`288`	`gotorloop;`
`289`	`289`	`caseSSL_ERROR_SYSCALL:`
`290`		`-if (n==-1)`
`291`		`-ereport(COMMERROR,`
`292`		`-(errcode_for_socket_access(),`
`293`		`-errmsg("SSL SYSCALL error: %m")));`
`294`		`-else`
	`290`	`+/* leave it to caller to ereport the value of errno */`
	`291`	`+if (n!=-1)`
`295`	`292`	`{`
`296`		`-ereport(COMMERROR,`
`297`		`-(errcode(ERRCODE_PROTOCOL_VIOLATION),`
`298`		`-errmsg("SSL SYSCALL error: EOF detected")));`
`299`	`293`	`errno=ECONNRESET;`
`300`	`294`	`n=-1;`
`301`	`295`	`}`
`@@ -387,15 +381,9 @@ secure_write(Port port, void ptr, size_t len)`
`387`	`381`	`#endif`
`388`	`382`	`gotowloop;`
`389`	`383`	`caseSSL_ERROR_SYSCALL:`
`390`		`-if (n==-1)`
`391`		`-ereport(COMMERROR,`
`392`		`-(errcode_for_socket_access(),`
`393`		`-errmsg("SSL SYSCALL error: %m")));`
`394`		`-else`
	`384`	`+/* leave it to caller to ereport the value of errno */`
	`385`	`+if (n!=-1)`
`395`	`386`	`{`
`396`		`-ereport(COMMERROR,`
`397`		`-(errcode(ERRCODE_PROTOCOL_VIOLATION),`
`398`		`-errmsg("SSL SYSCALL error: EOF detected")));`
`399`	`387`	`errno=ECONNRESET;`
`400`	`388`	`n=-1;`
`401`	`389`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitd1972c5

File tree

1 file changed

1 file changed

`‎src/backend/libpq/be-secure.c`

0 commit comments