aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Paquier <michael@paquier.xyz>2019-10-21 11:39:15 +0900
committerMichael Paquier <michael@paquier.xyz>2019-10-21 11:39:15 +0900
commitba19a6b73c5bd771d8864171ede03503a9ff564e (patch)
tree8b3cf7736d7de333394eec69bc21b2344dd59688 /src
parent4f4061b2dde178d2ab79d1ee3b1ae3c62c117926 (diff)
downloadpostgresql-ba19a6b73c5bd771d8864171ede03503a9ff564e.tar.gz
postgresql-ba19a6b73c5bd771d8864171ede03503a9ff564e.zip
Fix error reporting of connect_timeout in libpq for value parsing
The logic was correctly detecting a parsing failure, but the parsing error did not get reported back to the client properly. Reported-by: Ed Morley Author: Lars Kanis Reviewed-by: Michael Paquier Discussion: https://postgr.es/m/a9b4cbd7-4ecb-06b2-ebd7-1739bbff3217@greiz-reinsdorf.de Backpatch-through: 12
Diffstat (limited to 'src')
-rw-r--r--src/interfaces/libpq/fe-connect.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index e02564420c1..9af830321c3 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -2025,7 +2025,11 @@ connectDBComplete(PGconn *conn)
{
if (!parse_int_param(conn->connect_timeout, &timeout, conn,
"connect_timeout"))
+ {
+ /* mark the connection as bad to report the parsing failure */
+ conn->status = CONNECTION_BAD;
return 0;
+ }
if (timeout > 0)
{