diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml index 0db3667fdf..aed45f3428 100644 --- a/doc/src/sgml/libpq.sgml +++ b/doc/src/sgml/libpq.sgml @@ -1803,6 +1803,15 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname process adds significant latency if the initial SSL connection fails. + + An exception is if gssencmode is set + to prefer, but the server rejects GSS encryption. + In that case, SSL is negotiated over the same TCP connection using + PostgreSQL protocol negotiation. In + other words, the direct SSL handshake is not used, if a TCP + connection has already been established and can be used for the + SSL handshake. + @@ -1816,16 +1825,6 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname - - - Note that if gssencmode is set - to prefer, a GSS connection is - attempted first. If the server rejects GSS encryption, SSL is - negotiated over the same TCP connection using the traditional postgres - protocol, regardless of sslnegotiation. In other - words, the direct SSL handshake is not used, if a TCP connection has - already been established and can be used for the SSL handshake. - diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index ec20e3f3a9..5c6f0d9943 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -4430,11 +4430,12 @@ select_next_encryption_method(PGconn *conn, bool have_valid_connection) /* * If enabled, try direct SSL. Unless we have a valid TCP connection that - * failed negotiating GSSAPI encryption or a plaintext connection in case - * of sslmode='allow'; in that case we prefer to reuse the connection with - * negotiated SSL, instead of reconnecting to do direct SSL. The point of - * direct SSL is to avoid the roundtrip from the negotiation, but - * reconnecting would also incur a roundtrip. + * failed negotiating GSSAPI encryption; in that case we prefer to reuse + * the connection with negotiated SSL, instead of reconnecting to do + * direct SSL. The point of sslnegotiation=direct is to avoid the + * roundtrip from the negotiation, but reconnecting would also incur a + * roundtrip. (In sslnegotiation=requiredirect mode, negotiated SSL is not + * in the list of allowed methods and we will reconnect.) */ if (have_valid_connection) SELECT_NEXT_METHOD(ENC_NEGOTIATED_SSL);