You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by su...@apache.org on 2015/06/12 18:55:53 UTC
[1/2] trafficserver git commit: [TS-3126]: Remove the config setting
that controls sending of HTTP status response (408) on a POST failure (e.g
timeout) and make the sending of 408 default
Repository: trafficserver
Updated Branches:
refs/heads/master df4761ee4 -> 15cc130a1
[TS-3126]: Remove the config setting that controls sending of HTTP status
response (408) on a POST failure (e.g timeout) and make the sending of 408
default
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/9500799f
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/9500799f
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/9500799f
Branch: refs/heads/master
Commit: 9500799f932d553619f02198b7d7f79e0655fe61
Parents: df4761e
Author: Sudheer Vinukonda <su...@yahoo-inc.com>
Authored: Fri Jun 12 16:53:20 2015 +0000
Committer: Sudheer Vinukonda <su...@yahoo-inc.com>
Committed: Fri Jun 12 16:53:20 2015 +0000
----------------------------------------------------------------------
doc/reference/configuration/records.config.en.rst | 4 ----
mgmt/RecordsConfig.cc | 2 --
proxy/http/HttpConfig.cc | 2 --
proxy/http/HttpConfig.h | 6 ++----
proxy/http/HttpSM.cc | 4 ++--
5 files changed, 4 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9500799f/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 473dcaa..70d5967 100644
--- a/doc/reference/configuration/records.config.en.rst
+++ b/doc/reference/configuration/records.config.en.rst
@@ -897,10 +897,6 @@ specific domains.
Controls wether new POST requests re-use keep-alive sessions (``1``) or
create new connections per request (``0``).
-.. ts:cv:: CONFIG proxy.config.http.send_408_post_timeout_response INT 0
-
- Controls wether POST timeout sends a HTTP status 408 response (``1``)
-
.. ts:cv:: CONFIG proxy.config.http.disallow_post_100_continue INT 0
Allows you to return a 405 Method Not Supported with Posts also
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9500799f/mgmt/RecordsConfig.cc
----------------------------------------------------------------------
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index b735721..e2d08f7 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -442,8 +442,6 @@ static const RecordElement RecordsConfig[] =
,
{RECT_CONFIG, "proxy.config.http.send_100_continue_response", RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.http.send_408_post_timeout_response", RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
- ,
{RECT_CONFIG, "proxy.config.http.disallow_post_100_continue", RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
{RECT_CONFIG, "proxy.config.http.share_server_sessions", RECD_INT, "2", RECU_RESTART_TS, RR_NULL, RECC_NULL, NULL, RECA_NULL}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9500799f/proxy/http/HttpConfig.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpConfig.cc b/proxy/http/HttpConfig.cc
index aadd312..02115bf 100644
--- a/proxy/http/HttpConfig.cc
+++ b/proxy/http/HttpConfig.cc
@@ -1089,7 +1089,6 @@ HttpConfig::startup()
HttpEstablishStaticConfigByte(c.ignore_accept_charset_mismatch, "proxy.config.http.cache.ignore_accept_charset_mismatch");
HttpEstablishStaticConfigByte(c.send_100_continue_response, "proxy.config.http.send_100_continue_response");
- HttpEstablishStaticConfigByte(c.send_408_post_timeout_response, "proxy.config.http.send_408_post_timeout_response");
HttpEstablishStaticConfigByte(c.disallow_post_100_continue, "proxy.config.http.disallow_post_100_continue");
HttpEstablishStaticConfigByte(c.parser_allow_non_http, "proxy.config.http.parse.allow_non_http");
HttpEstablishStaticConfigLongLong(c.cache_open_write_fail_action, "proxy.config.http.cache.open_write_fail_action");
@@ -1352,7 +1351,6 @@ HttpConfig::reconfigure()
params->ignore_accept_charset_mismatch = m_master.ignore_accept_charset_mismatch;
params->send_100_continue_response = INT_TO_BOOL(m_master.send_100_continue_response);
- params->send_408_post_timeout_response = INT_TO_BOOL(m_master.send_408_post_timeout_response);
params->disallow_post_100_continue = INT_TO_BOOL(m_master.disallow_post_100_continue);
params->parser_allow_non_http = INT_TO_BOOL(m_master.parser_allow_non_http);
params->cache_open_write_fail_action = m_master.cache_open_write_fail_action;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9500799f/proxy/http/HttpConfig.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpConfig.h b/proxy/http/HttpConfig.h
index 812d2c8..aaf48fa 100644
--- a/proxy/http/HttpConfig.h
+++ b/proxy/http/HttpConfig.h
@@ -740,7 +740,6 @@ public:
MgmtByte ignore_accept_charset_mismatch;
MgmtByte send_100_continue_response;
- MgmtByte send_408_post_timeout_response;
MgmtByte disallow_post_100_continue;
MgmtByte parser_allow_non_http;
MgmtInt cache_open_write_fail_action;
@@ -853,9 +852,8 @@ inline HttpConfigParams::HttpConfigParams()
reverse_proxy_enabled(0), url_remap_required(1), record_cop_page(0), errors_log_error_pages(1), enable_http_info(0),
cluster_time_delta(0), redirection_enabled(0), redirection_host_no_port(0), number_of_redirections(1), post_copy_size(2048),
ignore_accept_mismatch(0), ignore_accept_language_mismatch(0), ignore_accept_encoding_mismatch(0),
- ignore_accept_charset_mismatch(0), send_100_continue_response(0), send_408_post_timeout_response(0),
- disallow_post_100_continue(0), parser_allow_non_http(1), cache_open_write_fail_action(0), max_post_size(0), autoconf_port(0),
- autoconf_localhost_only(0)
+ ignore_accept_charset_mismatch(0), send_100_continue_response(0), disallow_post_100_continue(0), parser_allow_non_http(1),
+ cache_open_write_fail_action(0), max_post_size(0), autoconf_port(0), autoconf_localhost_only(0)
{
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9500799f/proxy/http/HttpSM.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index 9a8b2b3..b913bff 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -2610,7 +2610,7 @@ HttpSM::tunnel_handler_post(int event, void *data)
ua_entry->write_buffer = NULL;
}
}
- if (t_state.http_config_param->send_408_post_timeout_response && p->handler_state == HTTP_SM_POST_UA_FAIL) {
+ if (p->handler_state == HTTP_SM_POST_UA_FAIL) {
Debug("http_tunnel", "cleanup tunnel in tunnel_handler_post");
hsm_release_assert(ua_entry->in_tunnel == true);
ink_assert((event == VC_EVENT_WRITE_COMPLETE) || (event == VC_EVENT_EOS));
@@ -3306,7 +3306,7 @@ HttpSM::tunnel_handler_post_ua(int event, HttpTunnelProducer *p)
switch (event) {
case VC_EVENT_INACTIVITY_TIMEOUT:
case VC_EVENT_ACTIVE_TIMEOUT:
- if (t_state.http_config_param->send_408_post_timeout_response && client_response_hdr_bytes == 0) {
+ if (client_response_hdr_bytes == 0) {
p->handler_state = HTTP_SM_POST_UA_FAIL;
set_ua_abort(HttpTransact::ABORTED, event);
[2/2] trafficserver git commit: [TS-3126]: update CHANGES
Posted by su...@apache.org.
[TS-3126]: update CHANGES
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/15cc130a
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/15cc130a
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/15cc130a
Branch: refs/heads/master
Commit: 15cc130a1f16762417417ff1e1a549b8b30ba860
Parents: 9500799
Author: Sudheer Vinukonda <su...@yahoo-inc.com>
Authored: Fri Jun 12 16:55:37 2015 +0000
Committer: Sudheer Vinukonda <su...@yahoo-inc.com>
Committed: Fri Jun 12 16:55:37 2015 +0000
----------------------------------------------------------------------
CHANGES | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/15cc130a/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 7abff53..8b5073b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 6.0.0
+ *) [TS-3126]: Remove the config setting that controls sending of HTTP status
+ response (408) on a POST failure (e.g timeout) and make the sending of 408
+ default.
+
*) [TS-2512] Deprecate the channel_stats plugin.
*) [TS-3687] ATS Session Cache should remove expired sessions.