This is an automated email from the ASF dual-hosted git repository.
rrm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 4161724 Revert "Propagate proxy.config.net.sock_option_flag_in to
newly accepted connections (#8463)" (#8622)
4161724 is described below
commit 4161724860940b91f8ceb6235fd8d53e656ef9b0
Author: Randall Meyer <r...@apache.org>
AuthorDate: Fri Jan 21 09:33:54 2022 -0800
Revert "Propagate proxy.config.net.sock_option_flag_in to newly accepted
connections (#8463)" (#8622)
This reverts commit f07142481eb6c30b5220d0819b4dbe610bfc5bc0.
This is backwards incompatible for a potential 9.3.x based off of
current master. This change will be resubmitted to the 10-dev branch
---
doc/admin-guide/files/records.config.en.rst | 2 +-
iocore/net/UnixNetAccept.cc | 2 --
mgmt/RecordsConfig.cc | 2 +-
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/doc/admin-guide/files/records.config.en.rst
b/doc/admin-guide/files/records.config.en.rst
index 3c5445b..21792a3 100644
--- a/doc/admin-guide/files/records.config.en.rst
+++ b/doc/admin-guide/files/records.config.en.rst
@@ -4639,7 +4639,7 @@ Sockets
Sets the receive buffer size for connections from the client to |TS|.
-.. ts:cv:: CONFIG proxy.config.net.sock_option_flag_in INT 0x1
+.. ts:cv:: CONFIG proxy.config.net.sock_option_flag_in INT 0x5
Turns different options "on" for the socket handling client connections:::
diff --git a/iocore/net/UnixNetAccept.cc b/iocore/net/UnixNetAccept.cc
index 1953695..1ce5923 100644
--- a/iocore/net/UnixNetAccept.cc
+++ b/iocore/net/UnixNetAccept.cc
@@ -348,7 +348,6 @@ NetAccept::do_blocking_accept(EThread *t)
vc->action_ = *action_;
vc->set_is_transparent(opt.f_inbound_transparent);
vc->set_is_proxy_protocol(opt.f_proxy_protocol);
- vc->options.sockopt_flags = opt.sockopt_flags;
vc->options.packet_mark = opt.packet_mark;
vc->options.packet_tos = opt.packet_tos;
vc->options.packet_notsent_lowat = opt.packet_notsent_lowat;
@@ -501,7 +500,6 @@ NetAccept::acceptFastEvent(int event, void *ep)
vc->action_ = *action_;
vc->set_is_transparent(opt.f_inbound_transparent);
vc->set_is_proxy_protocol(opt.f_proxy_protocol);
- vc->options.sockopt_flags = opt.sockopt_flags;
vc->options.packet_mark = opt.packet_mark;
vc->options.packet_tos = opt.packet_tos;
vc->options.packet_notsent_lowat = opt.packet_notsent_lowat;
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index 9826d75..88e19f5 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -770,7 +770,7 @@ static const RecordElement RecordsConfig[] =
,
{RECT_CONFIG, "proxy.config.net.sock_send_buffer_size_in", RECD_INT, "0",
RECU_RESTART_TS, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.net.sock_option_flag_in", RECD_INT, "0x1",
RECU_RESTART_TS, RR_NULL, RECC_NULL, nullptr, RECA_NULL}
+ {RECT_CONFIG, "proxy.config.net.sock_option_flag_in", RECD_INT, "0x5",
RECU_RESTART_TS, RR_NULL, RECC_NULL, nullptr, RECA_NULL}
,
{RECT_CONFIG, "proxy.config.net.sock_packet_mark_in", RECD_INT, "0x0",
RECU_RESTART_TS, RR_NULL, RECC_NULL, nullptr, RECA_NULL}
,
