Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit64aea1e

Browse files
committed
Add libpq connection option to disable SSL compression
This can be used to remove the overhead of SSL compression onfast networks.Laurenz Albe
1 parentdd3bab5 commit64aea1e

File tree

4 files changed

+48
-0
lines changed

4 files changed

+48
-0
lines changed

‎doc/src/sgml/libpq.sgml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -494,6 +494,28 @@ PGconn *PQconnectdbParams(const char * const *keywords,
494494
</listitem>
495495
</varlistentry>
496496

497+
<varlistentry id="libpq-connect-sslcompression" xreflabel="sslcompression">
498+
<term><literal>sslcompression</literal></term>
499+
<listitem>
500+
<para>
501+
If set to 1 (default), data sent over SSL connections will be
502+
compressed (this requires <productname>OpenSSL</> version
503+
0.9.8 or later).
504+
If set to 0, compression will be disabled (this requires
505+
<productname>OpenSSL</> 1.0.0 or later).
506+
This parameter is ignored if a connection without SSL is made,
507+
or if the version of <productname>OpenSSL</> used does not support
508+
it.
509+
</para>
510+
<para>
511+
Compression uses CPU time, but can improve throughput if
512+
the network is the bottleneck.
513+
Disabling compression can improve response time and throughput
514+
if CPU performance is the limiting factor.
515+
</para>
516+
</listitem>
517+
</varlistentry>
518+
497519
<varlistentry id="libpq-connect-sslcert" xreflabel="sslcert">
498520
<term><literal>sslcert</literal></term>
499521
<listitem>
@@ -6308,6 +6330,16 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
63086330
</para>
63096331
</listitem>
63106332

6333+
<listitem>
6334+
<para>
6335+
<indexterm>
6336+
<primary><envar>PGSSLCOMPRESSION</envar></primary>
6337+
</indexterm>
6338+
<envar>PGSSLCOMPRESSION</envar> behaves the same as the <xref
6339+
linkend="libpq-connect-sslcompression"> connection parameter.
6340+
</para>
6341+
</listitem>
6342+
63116343
<listitem>
63126344
<para>
63136345
<indexterm>

‎src/interfaces/libpq/fe-connect.c‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,9 @@ static const PQconninfoOption PQconninfoOptions[] = {
222222
{"sslmode","PGSSLMODE",DefaultSSLMode,NULL,
223223
"SSL-Mode","",8},/* sizeof("disable") == 8 */
224224

225+
{"sslcompression","PGSSLCOMPRESSION","1",NULL,
226+
"SSL-Compression","",1},
227+
225228
{"sslcert","PGSSLCERT",NULL,NULL,
226229
"SSL-Client-Cert","",64},
227230

@@ -621,6 +624,8 @@ fillPGconn(PGconn *conn, PQconninfoOption *connOptions)
621624
conn->keepalives_count=tmp ?strdup(tmp) :NULL;
622625
tmp=conninfo_getval(connOptions,"sslmode");
623626
conn->sslmode=tmp ?strdup(tmp) :NULL;
627+
tmp=conninfo_getval(connOptions,"sslcompression");
628+
conn->sslcompression=tmp ?strdup(tmp) :NULL;
624629
tmp=conninfo_getval(connOptions,"sslkey");
625630
conn->sslkey=tmp ?strdup(tmp) :NULL;
626631
tmp=conninfo_getval(connOptions,"sslcert");

‎src/interfaces/libpq/fe-secure.c‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1292,6 +1292,16 @@ initialize_SSL(PGconn *conn)
12921292
}
12931293
}
12941294

1295+
/*
1296+
* If the OpenSSL version used supports it (from 1.0.0 on)
1297+
* and the user requested it, disable SSL compression.
1298+
*/
1299+
#ifdefSSL_OP_NO_COMPRESSION
1300+
if (conn->sslcompression&&conn->sslcompression[0]=='0') {
1301+
SSL_set_options(conn->ssl,SSL_OP_NO_COMPRESSION);
1302+
}
1303+
#endif
1304+
12951305
return0;
12961306
}
12971307

‎src/interfaces/libpq/libpq-int.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,7 @@ struct pg_conn
310310
char*keepalives_count;/* maximum number of TCP keepalive
311311
* retransmits */
312312
char*sslmode;/* SSL mode (require,prefer,allow,disable) */
313+
char*sslcompression;/* SSL compression (0 or 1) */
313314
char*sslkey;/* client key filename */
314315
char*sslcert;/* client certificate filename */
315316
char*sslrootcert;/* root certificate filename */

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp