Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions doc/admin-guide/files/records.config.en.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1246,8 +1246,8 @@ HTTP Connection Timeouts
:overridable:

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

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

Expand All @@ -1256,8 +1256,8 @@ HTTP Connection Timeouts
:overridable:

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

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

Expand Down
2 changes: 1 addition & 1 deletion mgmt/RecordsConfig.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1150,7 +1150,7 @@ static const RecordElement RecordsConfig[] =
,
{RECT_CONFIG, "proxy.config.ssl.server.dhparams_file", RECD_STRING, nullptr, RECU_RESTART_TS, RR_NULL, RECC_NULL, nullptr, RECA_NULL}
,
{RECT_CONFIG, "proxy.config.ssl.handshake_timeout_in", RECD_INT, "0", RECU_RESTART_TS, RR_NULL, RECC_INT, "[0-65535]", RECA_NULL}
{RECT_CONFIG, "proxy.config.ssl.handshake_timeout_in", RECD_INT, "30", RECU_RESTART_TS, RR_NULL, RECC_INT, "[0-65535]", RECA_NULL}
,
{RECT_CONFIG, "proxy.config.ssl.cert.load_elevated", RECD_INT, "0", RECU_RESTART_TS, RR_NULL, RECC_INT, "[0-1]", RECA_READ_ONLY}
,
Expand Down