postgres
diff --git a/‎doc/src/sgml/libpq.sgml
Copy file name to clipboardExpand all lines: doc/src/sgml/libpq.sgml
+20-11Lines changed: 20 additions & 11 deletions b/‎doc/src/sgml/libpq.sgml
Copy file name to clipboardExpand all lines: doc/src/sgml/libpq.sgml
+20-11Lines changed: 20 additions & 11 deletions
diff --git a/‎src/interfaces/libpq/fe-connect.c
Copy file name to clipboardExpand all lines: src/interfaces/libpq/fe-connect.c
+1-1Lines changed: 1 addition & 1 deletion b/‎src/interfaces/libpq/fe-connect.c
Copy file name to clipboardExpand all lines: src/interfaces/libpq/fe-connect.c
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/interfaces/libpq/fe-secure-openssl.c
Copy file name to clipboardExpand all lines: src/interfaces/libpq/fe-secure-openssl.c
+4-4Lines changed: 4 additions & 4 deletions b/‎src/interfaces/libpq/fe-secure-openssl.c
Copy file name to clipboardExpand all lines: src/interfaces/libpq/fe-secure-openssl.c
+4-4Lines changed: 4 additions & 4 deletions
@@ -1438,19 +1438,28 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
       <term><literal>sslcompression</literal></term>
       <listitem>
        <para>
-        If set to 1 (default), data sent over SSL connections will be
-        compressed.
-        If set to 0, compression will be disabled (this requires
-        <productname>OpenSSL</productname> 1.0.0 or later).
-        This parameter is ignored if a connection without SSL is made,
-        or if the version of <productname>OpenSSL</productname> used does not support
-        it.
+        If set to 1, data sent over SSL connections will be compressed.  If
+        set to 0, compression will be disabled.  The default is 0.  This
+        parameter is ignored if a connection without SSL is made.
        </para>
+
+       <para>
+        SSL compression is nowadays considered insecure and its use is no
+        longer recommended.  <productname>OpenSSL</productname> 1.1.0 disables
+        compression by default, and many operating system distributions
+        disable it in prior versions as well, so setting this parameter to on
+        will not have any effect if the server does not accept compression.
+        On the other hand, <productname>OpenSSL</productname> before 1.0.0
+        does not support disabling compression, so this parameter is ignored
+        with those versions, and whether compression is used depends on the
+        server.
+       </para>
+
        <para>
-        Compression uses CPU time, but can improve throughput if
-        the network is the bottleneck.
-        Disabling compression can improve response time and throughput
-        if CPU performance is the limiting factor.
+        If security is not a primary concern, compression can improve
+        throughput if the network is the bottleneck.  Disabling compression
+        can improve response time and throughput if CPU performance is the
+        limiting factor.
        </para>
       </listitem>
      </varlistentry>
 
@@ -279,7 +279,7 @@ static const internalPQconninfoOption PQconninfoOptions[] = {
 		"SSL-Mode", "", 12,		/* sizeof("verify-full") == 12 */
 	offsetof(struct pg_conn, sslmode)},
 
-	{"sslcompression", "PGSSLCOMPRESSION", "1", NULL,
+	{"sslcompression", "PGSSLCOMPRESSION", "0", NULL,
 		"SSL-Compression", "", 1,
 	offsetof(struct pg_conn, sslcompression)},
 
 
@@ -1188,14 +1188,14 @@ initialize_SSL(PGconn *conn)
 		SSL_set_verify(conn->ssl, SSL_VERIFY_PEER, verify_cb);
 
 	/*
-	 * If the OpenSSL version used supports it (from 1.0.0 on) and the user
-	 * requested it, disable SSL compression.
+	 * Set compression option if the OpenSSL version used supports it (from
+	 * 1.0.0 on).
 	 */
 #ifdef SSL_OP_NO_COMPRESSION
 	if (conn->sslcompression && conn->sslcompression[0] == '0')
-	{
 		SSL_set_options(conn->ssl, SSL_OP_NO_COMPRESSION);
-	}
+	else
+		SSL_clear_options(conn->ssl, SSL_OP_NO_COMPRESSION);
 #endif
 
 	return 0;