diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2010-02-25 23:44:27 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2010-02-25 23:44:27 +0000 |
| commit | a3609304b7da2592457428306c6f0d57e404c072 (patch) | |
| tree | 532aaf180daa071ab20a9bd7bb22f3a9a19fab8b /src/backend/utils/misc | |
| parent | 26662b73ae5eca884c23c386b79e1f507c4c8d9d (diff) | |
| download | postgresql-a3609304b7da2592457428306c6f0d57e404c072.tar.gz postgresql-a3609304b7da2592457428306c6f0d57e404c072.zip | |
Back-patch addition of ssl_renegotiation_limit into 7.4 through 8.1.
Diffstat (limited to 'src/backend/utils/misc')
| -rw-r--r-- | src/backend/utils/misc/guc.c | 12 | ||||
| -rw-r--r-- | src/backend/utils/misc/postgresql.conf.sample | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index ed734975854..ae75354b4a1 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -10,7 +10,7 @@ * Written by Peter Eisentraut <peter_e@gmx.net>. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.299.2.7 2010/01/24 21:49:58 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.299.2.8 2010/02/25 23:44:27 tgl Exp $ * *-------------------------------------------------------------------- */ @@ -97,6 +97,7 @@ extern int CommitDelay; extern int CommitSiblings; extern char *default_tablespace; extern bool fullPageWrites; +extern int ssl_renegotiation_limit; #ifdef TRACE_SORT extern bool trace_sort; @@ -1501,6 +1502,15 @@ static struct config_int ConfigureNamesInt[] = }, { + {"ssl_renegotiation_limit", PGC_USERSET, CONN_AUTH_SECURITY, + gettext_noop("Set the amount of traffic to send and receive before renegotiating the encryption keys."), + NULL + }, + &ssl_renegotiation_limit, + 512 * 1024, 0, MAX_KILOBYTES, NULL, NULL + }, + + { {"tcp_keepalives_idle", PGC_USERSET, CLIENT_CONN_OTHER, gettext_noop("Seconds between issuing TCP keepalives."), gettext_noop("A value of 0 uses the system default."), diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index b1bdd3b4be4..29d7c078524 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -64,6 +64,8 @@ #authentication_timeout = 60 # 1-600, in seconds #ssl = off +#ssl_renegotiation_limit = 524288 # amount of data between renegotiations + # in kilobytes #password_encryption = on #db_user_namespace = off |