Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 334f4e1

Browse files
committed
Reformat 'sslmode' options into an SGML table; improve wording.
1 parent 418fd59 commit 334f4e1

File tree

1 file changed

+45
-13
lines changed

1 file changed

+45
-13
lines changed

doc/src/sgml/libpq.sgml

+45-13
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/libpq.sgml,v 1.283 2009/04/11 16:46:54 momjian Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/libpq.sgml,v 1.284 2009/04/14 20:42:48 momjian Exp $ -->
22

33
<chapter id="libpq">
44
<title><application>libpq</application> - C Library</title>
@@ -254,23 +254,55 @@
254254
<para>
255255
This option determines whether or with what priority a
256256
<acronym>SSL</> TCP/IP connection will be negotiated with the
257-
server. There are four modes: <literal>disable</> will attempt
258-
only an unencrypted <acronym>SSL</> connection;
259-
<literal>allow</> will negotiate, trying first a
260-
non-<acronym>SSL</> connection, then if that fails, trying an
261-
<acronym>SSL</> connection; <literal>prefer</> (the default)
262-
will negotiate, trying first an <acronym>SSL</> connection,
263-
then if that fails, trying a regular non-<acronym>SSL</>
264-
connection; <literal>require</> will try only an
265-
<acronym>SSL</> connection. <literal>sslmode</> is ignored
266-
for Unix domain socket communication.
267-
</para>
257+
server. There are four modes:
258+
259+
<table id="libpq-connect-sslmode-options">
260+
<title><literal>sslmode</literal> options</title>
261+
<tgroup cols="2">
262+
<thead>
263+
<row>
264+
<entry>Option</entry>
265+
<entry>Description</entry>
266+
</row>
267+
</thead>
268+
269+
<tbody>
270+
271+
<row>
272+
<entry><literal>disable</></entry>
273+
<entry>only try a non-<acronym>SSL</> connection
274+
</row>
275+
276+
<row>
277+
<entry><literal>allow</></entry>
278+
<entry>first try a non-<acronym>SSL</>
279+
connection; if that fails, try an <acronym>SSL</>
280+
connection</entry>
281+
</row>
282+
283+
<row>
284+
<entry><literal>prefer</> (default)</entry>
285+
<entry>first try an <acronym>SSL</> connection; if
286+
that fails, try a non-<acronym>SSL</>
287+
connection</entry>
288+
</row>
289+
290+
<row>
291+
<entry><literal>require</></entry>
292+
<entry>only try an <acronym>SSL</> connection</entry>
293+
</row>
294+
295+
</tbody>
296+
</tgroup>
297+
</table>
268298

269299
<para>
300+
<literal>sslmode</> is ignored for Unix domain socket
301+
communication.
270302
If <productname>PostgreSQL</> is compiled without SSL support,
271303
using option <literal>require</> will cause an error, while
272304
options <literal>allow</> and <literal>prefer</> will be
273-
accepted but <application>libpq</> will not in fact attempt
305+
accepted but <application>libpq</> will not actually attempt
274306
an <acronym>SSL</>
275307
connection.<indexterm><primary>SSL</><secondary
276308
sortas="libpq">with libpq</></indexterm>

0 commit comments

Comments
 (0)