Commit85d94c5

committed

Avoid extra newline in errors received in FE protocol version 2.

Contrary to what the comment said, the postmaster does in fact end allits messages in a newline, since server version 7.2. Be tidy and don'tadd an extra newline if the error message already has one.Discussion:https://www.postgresql.org/message-id/CAFBsxsEdgMXc%2BtGfEy9Y41i%3D5pMMjKeH8t8vSAypR3ZnAoQnHg%40mail.gmail.com

1 parent3174d69 commit85d94c5Copy full SHA for 85d94c5

File tree

-3

lines changed

-3

lines changed

Lines changed: 8 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -3277,10 +3277,15 @@ PQconnectPoll(PGconn *conn)`
`3277`	`3277`	`conn->inStart=conn->inCursor;`
`3278`	`3278`
`3279`	`3279`	`/*`
`3280`		`- * The postmaster typically won't end its message with a`
`3281`		`- * newline, so add one to conform to libpq conventions.`
	`3280`	`+ * Before 7.2, the postmaster didn't always end its`
	`3281`	`+ * messages with a newline, so add one if needed to`
	`3282`	`+ * conform to libpq conventions.`
`3282`	`3283`	`*/`
`3283`		`-appendPQExpBufferChar(&conn->errorMessage,'\n');`
	`3284`	`+if (conn->errorMessage.len==0\|\|`
	`3285`	`+conn->errorMessage.data[conn->errorMessage.len-1]!='\n')`
	`3286`	`+{`
	`3287`	`+appendPQExpBufferChar(&conn->errorMessage,'\n');`
	`3288`	`+}`
`3284`	`3289`
`3285`	`3290`	`gotoerror_return;`
`3286`	`3291`	`}`

Comments

(0)