summaryrefslogtreecommitdiff
path: root/doc/src
diff options
context:
space:
mode:
authorRobert Haas <rhaas@postgresql.org>2016-11-22 15:32:13 -0500
committerRobert Haas <rhaas@postgresql.org>2016-11-22 15:50:39 -0500
commit9a1d0af4ad2cbd419115b453d811c141b80d872b (patch)
treeea1e9dd3554984a54a21ee541435f9b239bbe351 /doc/src
parent906bfcad7ba7cb3863fe0e2a7810be8e3cd84fbd (diff)
Code review for commit 274bb2b3857cc987cfa21d14775cae9b0dababa5.
Avoid memory leak in conninfo_uri_parse_options. Use the current host rather than the comma-separated list of host names when the host name is needed for GSS, SSPI, or SSL authentication. Document the way connect_timeout interacts with multiple host specifications. Takayuki Tsunakawa
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/sgml/libpq.sgml4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index d04dba7493b..0f375bf5f25 100644
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -1009,6 +1009,10 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
Maximum wait for connection, in seconds (write as a decimal integer
string). Zero or not specified means wait indefinitely. It is not
recommended to use a timeout of less than 2 seconds.
+ This timeout applies separately to each connection attempt.
+ For example, if you specify two hosts and both of them are unreachable,
+ and <literal>connect_timeout</> is 5, the total time spent waiting for a
+ connection might be up to 10 seconds.
</para>
</listitem>
</varlistentry>