Skip to content

Commit 54875d1

Browse files
sudheervzwoop
authored andcommitted
1. Set a non-zero default value for TLS Client Handshake Timeout (#6781)
Set a non-zero default value for TLS Client Handshake Timeout doc updates to clarify that no activity timeouts will use default inactivity timeout value when they are set to 0 (cherry picked from commit 2188810)
1 parent 977f919 commit 54875d1

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

doc/admin-guide/files/records.config.en.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1230,8 +1230,8 @@ HTTP Connection Timeouts
12301230
:overridable:
12311231

12321232
Specifies how long |TS| keeps connections to clients open for a
1233-
subsequent request after a transaction ends. A value of ``0`` will disable
1234-
the no activity timeout.
1233+
subsequent request after a transaction ends. A value of ``0`` will set
1234+
`proxy.config.net.default_inactivity_timeout` as the timeout.
12351235

12361236
See :ref:`admin-performance-timeouts` for more discussion on |TS| timeouts.
12371237

@@ -1240,8 +1240,8 @@ HTTP Connection Timeouts
12401240
:overridable:
12411241

12421242
Specifies how long |TS| keeps connections to origin servers open
1243-
for a subsequent transfer of data after a transaction ends. A value of
1244-
``0`` will disable the no activity timeout.
1243+
for a subsequent transfer of data after a transaction ends. A value of ``0`` will
1244+
set `proxy.config.net.default_inactivity_timeout` as the timeout.
12451245

12461246
See :ref:`admin-performance-timeouts` for more discussion on |TS| timeouts.
12471247

mgmt/RecordsConfig.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1150,7 +1150,7 @@ static const RecordElement RecordsConfig[] =
11501150
,
11511151
{RECT_CONFIG, "proxy.config.ssl.server.dhparams_file", RECD_STRING, nullptr, RECU_RESTART_TS, RR_NULL, RECC_NULL, nullptr, RECA_NULL}
11521152
,
1153-
{RECT_CONFIG, "proxy.config.ssl.handshake_timeout_in", RECD_INT, "0", RECU_RESTART_TS, RR_NULL, RECC_INT, "[0-65535]", RECA_NULL}
1153+
{RECT_CONFIG, "proxy.config.ssl.handshake_timeout_in", RECD_INT, "30", RECU_RESTART_TS, RR_NULL, RECC_INT, "[0-65535]", RECA_NULL}
11541154
,
11551155
{RECT_CONFIG, "proxy.config.ssl.cert.load_elevated", RECD_INT, "0", RECU_RESTART_TS, RR_NULL, RECC_INT, "[0-1]", RECA_READ_ONLY}
11561156
,

0 commit comments

Comments
 (0)