Repository: trafficserver Updated Branches: refs/heads/master 37ff55f7c -> ae4aabe60
TS-2405 Change the default for proxy.config.net.sock_option_flag_out to 1, which enables TCP_NODELAY. Authors: bcall, leif, xiongzongtao Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/ae4aabe6 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/ae4aabe6 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/ae4aabe6 Branch: refs/heads/master Commit: ae4aabe60a1ef11d2c0fd5c1815a07afaf8768b0 Parents: 37ff55f Author: Leif Hedstrom <[email protected]> Authored: Tue Feb 25 16:29:32 2014 -0700 Committer: Leif Hedstrom <[email protected]> Committed: Tue Feb 25 16:54:27 2014 -0700 ---------------------------------------------------------------------- CHANGES | 3 +++ doc/reference/configuration/records.config.en.rst | 2 +- mgmt/RecordsConfig.cc | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ae4aabe6/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 862933e..383e31d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 5.0.0 + *) [TS-2405] Change the default for proxy.config.net.sock_option_flag_out to + 1, which enables TCP_NODELAY. + *) [TS-2531] The default remap rule doesn't match a forward proxy request *) [TS-612] Add support for SSL keys with passphrases. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ae4aabe6/doc/reference/configuration/records.config.en.rst ---------------------------------------------------------------------- diff --git a/doc/reference/configuration/records.config.en.rst b/doc/reference/configuration/records.config.en.rst index 846637b..fc2fdcc 100644 --- a/doc/reference/configuration/records.config.en.rst +++ b/doc/reference/configuration/records.config.en.rst @@ -2269,7 +2269,7 @@ Sockets Sets the receive buffer size for connections from Traffic Server to the origin server. -.. ts:cv:: CONFIG proxy.config.net.sock_option_flag_out INT 0 +.. ts:cv:: CONFIG proxy.config.net.sock_option_flag_out INT 1 Turns different options "on" for the origin server socket::: http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ae4aabe6/mgmt/RecordsConfig.cc ---------------------------------------------------------------------- diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc index 10566b0..929be7c 100644 --- a/mgmt/RecordsConfig.cc +++ b/mgmt/RecordsConfig.cc @@ -792,7 +792,7 @@ RecordElement RecordsConfig[] = { , {RECT_CONFIG, "proxy.config.net.sock_send_buffer_size_out", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL} , - {RECT_CONFIG, "proxy.config.net.sock_option_flag_out", RECD_INT, "0x0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL} + {RECT_CONFIG, "proxy.config.net.sock_option_flag_out", RECD_INT, "0x1", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL} , {RECT_CONFIG, "proxy.config.net.sock_packet_mark_out", RECD_INT, "0x0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL} ,
