You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2010/09/21 20:58:11 UTC
svn commit: r999543 - in /trafficserver/traffic/trunk:
contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
proxy/http2/HttpConfig.cc proxy/http2/HttpProxyServerMain.cc
proxy/mgmt2/RecordsConfig.cc
Author: zwoop
Date: Tue Sep 21 18:58:11 2010
New Revision: 999543
URL: http://svn.apache.org/viewvc?rev=999543&view=rev
Log:
TS-451 Remove obsoleted (never used) configs
These configs were obsoleted long before the code went open source,
and has never been supported nor documented in Apache. There are
better named options that are used instead.
Modified:
trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
trafficserver/traffic/trunk/proxy/http2/HttpConfig.cc
trafficserver/traffic/trunk/proxy/http2/HttpProxyServerMain.cc
trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc
Modified: trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm?rev=999543&r1=999542&r2=999543&view=diff
==============================================================================
--- trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm (original)
+++ trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm Tue Sep 21 18:58:11 2010
@@ -580,18 +580,12 @@ The Apache Traffic Server Administration
proxy.config.net.max_kqueue_len
proxy.config.net.max_poll_delay
proxy.config.net.nt.main_accept_pool_size
- proxy.config.net.os_sock_option_flag
- proxy.config.net.os_sock_recv_buffer_size
- proxy.config.net.os_sock_send_buffer_size
proxy.config.net_snapshot_filename
proxy.config.net.sock_mss_in
- proxy.config.net.sock_option_flag
proxy.config.net.sock_option_flag_in
proxy.config.net.sock_option_flag_out
- proxy.config.net.sock_recv_buffer_size
proxy.config.net.sock_recv_buffer_size_in
proxy.config.net.sock_recv_buffer_size_out
- proxy.config.net.sock_send_buffer_size
proxy.config.net.sock_send_buffer_size_in
proxy.config.net.sock_send_buffer_size_out
proxy.config.net.tcp_accept_defer_timeout
Modified: trafficserver/traffic/trunk/proxy/http2/HttpConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/HttpConfig.cc?rev=999543&r1=999542&r2=999543&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/HttpConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/http2/HttpConfig.cc Tue Sep 21 18:58:11 2010
@@ -1073,15 +1073,6 @@ HttpConfig::startup()
HttpEstablishStaticConfigLongLong(c.sock_send_buffer_size_out, "proxy.config.net.sock_send_buffer_size_out");
HttpEstablishStaticConfigLongLong(c.sock_option_flag_out, "proxy.config.net.sock_option_flag_out");
- // deprecated configuration options
- // these should be removed in the future
- if (c.sock_recv_buffer_size_out == 0 && c.sock_send_buffer_size_out == 0 && c.sock_option_flag_out == 0) {
- HttpEstablishStaticConfigLongLong(c.sock_recv_buffer_size_out, "proxy.config.net.os_sock_recv_buffer_size");
- HttpEstablishStaticConfigLongLong(c.sock_send_buffer_size_out, "proxy.config.net.os_sock_send_buffer_size");
- HttpEstablishStaticConfigLongLong(c.sock_option_flag_out, "proxy.config.net.os_sock_option_flag");
- }
- // end of deprecated config options
-
c.fwd_proxy_auth_to_parent = 0;
HttpEstablishStaticConfigLongLong(c.anonymize_remove_from, "proxy.config.http.anonymize_remove_from");
Modified: trafficserver/traffic/trunk/proxy/http2/HttpProxyServerMain.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/HttpProxyServerMain.cc?rev=999543&r1=999542&r2=999543&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/HttpProxyServerMain.cc (original)
+++ trafficserver/traffic/trunk/proxy/http2/HttpProxyServerMain.cc Tue Sep 21 18:58:11 2010
@@ -288,15 +288,6 @@ start_HttpProxyServer(int fd, int port,
REC_ReadConfigInteger(opt.send_bufsize, "proxy.config.net.sock_send_buffer_size_in");
REC_ReadConfigInteger(opt.sockopt_flags, "proxy.config.net.sock_option_flag_in");
- // deprecated configuration options - bcall 4/25/07
- // these should be removed in the future
- if (opt.recv_bufsize == 0 && opt.send_bufsize == 0 && opt.sockopt_flags == 0) {
- REC_ReadConfigInteger(opt.recv_bufsize, "proxy.config.net.sock_recv_buffer_size");
- REC_ReadConfigInteger(opt.send_bufsize, "proxy.config.net.sock_send_buffer_size");
- REC_ReadConfigInteger(opt.sockopt_flags, "proxy.config.net.sock_option_flag");
- }
- // end of deprecated config options
-
if (attr_string) {
Attributes attr;
get_connection_attributes(attr_string, &attr);
Modified: trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc?rev=999543&r1=999542&r2=999543&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc Tue Sep 21 18:58:11 2010
@@ -1591,23 +1591,6 @@ RecordElement RecordsConfig[] = {
{CONFIG, "proxy.config.net.tcp_accept_defer_timeout", "", INK_INT, "0", RU_REREAD, RR_NULL, RC_INT, "^[0-9]+$",
RA_NULL}
,
-
- // deprecated configuration options - bcall 4/25/07
- // these should be removed in the future
- {CONFIG, "proxy.config.net.sock_recv_buffer_size", "", INK_INT, "0", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
- ,
- {CONFIG, "proxy.config.net.sock_send_buffer_size", "", INK_INT, "0", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
- ,
- {CONFIG, "proxy.config.net.sock_option_flag", "", INK_INT, "0x0", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
- ,
- {CONFIG, "proxy.config.net.os_sock_recv_buffer_size", "", INK_INT, "0", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
- ,
- {CONFIG, "proxy.config.net.os_sock_send_buffer_size", "", INK_INT, "0", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
- ,
- {CONFIG, "proxy.config.net.os_sock_option_flag", "", INK_INT, "0x0", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
- ,
- // end of deprecated config options
-
{CONFIG, "proxy.config.net.sock_recv_buffer_size_in", "", INK_INT, "0", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
,
{CONFIG, "proxy.config.net.sock_send_buffer_size_in", "", INK_INT, "0", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}