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/05/27 20:48:57 UTC
[1/2] trafficserver git commit: [TS-3642]: fix reading of
proxy.config.http.share_server_sessions
Repository: trafficserver
Updated Branches:
refs/heads/master 375bc9127 -> 349fb2f58
[TS-3642]: fix reading of proxy.config.http.share_server_sessions
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/a00c51bd
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/a00c51bd
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/a00c51bd
Branch: refs/heads/master
Commit: a00c51bd7bdfa0b18c1f0acd14ae750c64c43657
Parents: 375bc91
Author: Sudheer Vinukonda <su...@yahoo-inc.com>
Authored: Wed May 27 18:47:11 2015 +0000
Committer: Sudheer Vinukonda <su...@yahoo-inc.com>
Committed: Wed May 27 18:47:11 2015 +0000
----------------------------------------------------------------------
proxy/http/HttpConfig.cc | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a00c51bd/proxy/http/HttpConfig.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpConfig.cc b/proxy/http/HttpConfig.cc
index bfdd31b..f82c2de 100644
--- a/proxy/http/HttpConfig.cc
+++ b/proxy/http/HttpConfig.cc
@@ -192,7 +192,7 @@ http_server_session_sharing_cb(char const *name, RecDataT dtype, RecData data, v
bool valid_p = true;
HttpConfigParams *c = static_cast<HttpConfigParams *>(cookie);
- if (0 == strcasecmp("proxy.config.http.server_session_sharing.pool", name)) {
+ if (0 == strcasecmp("proxy.config.http.server_session_sharing.match", name)) {
MgmtByte &match = c->oride.server_session_sharing_match;
if (RECD_INT == dtype) {
match = static_cast<TSServerSessionSharingMatchType>(data.rec_int);
@@ -201,7 +201,7 @@ http_server_session_sharing_cb(char const *name, RecDataT dtype, RecData data, v
} else {
valid_p = false;
}
- } else if (0 == strcasecmp("proxy.config.http.server_session_sharing.match", name)) {
+ } else if (0 == strcasecmp("proxy.config.http.server_session_sharing.pool", name)) {
MgmtByte &match = c->oride.server_session_sharing_pool;
if (RECD_INT == dtype) {
match = static_cast<TSServerSessionSharingPoolType>(data.rec_int);
@@ -973,12 +973,6 @@ HttpConfig::startup()
HttpEstablishStaticConfigLongLong(c.oride.flow_high_water_mark, "proxy.config.http.flow_control.high_water");
HttpEstablishStaticConfigLongLong(c.oride.flow_low_water_mark, "proxy.config.http.flow_control.low_water");
HttpEstablishStaticConfigByte(c.oride.post_check_content_length_enabled, "proxy.config.http.post.check.content_length.enabled");
- // HttpEstablishStaticConfigByte(c.oride.share_server_sessions, "proxy.config.http.share_server_sessions");
-
- // 4.2 Backwards compatibility
- RecRegisterConfigUpdateCb("proxy.config.http.share_server_sessions", &http_server_session_sharing_cb, &c);
- http_config_share_server_sessions_read_bc(&c);
- // end 4.2 BC
// [amc] This is a bit of a mess, need to figure out to make this cleaner.
RecRegisterConfigUpdateCb("proxy.config.http.server_session_sharing.pool", &http_server_session_sharing_cb, &c);
@@ -988,6 +982,11 @@ HttpConfig::startup()
http_config_enum_read("proxy.config.http.server_session_sharing.match", SessionSharingMatchStrings,
c.oride.server_session_sharing_match);
+ // 4.2 Backwards compatibility - read this *after* the new server_session_sharing settings
+ RecRegisterConfigUpdateCb("proxy.config.http.share_server_sessions", &http_server_session_sharing_cb, &c);
+ http_config_share_server_sessions_read_bc(&c);
+ // end 4.2 BC
+
HttpEstablishStaticConfigByte(c.oride.auth_server_session_private, "proxy.config.http.auth_server_session_private");
HttpEstablishStaticConfigByte(c.oride.keep_alive_post_out, "proxy.config.http.keep_alive_post_out");
[2/2] trafficserver git commit: update CHANGES
Posted by su...@apache.org.
update CHANGES
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/349fb2f5
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/349fb2f5
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/349fb2f5
Branch: refs/heads/master
Commit: 349fb2f585ecbc8204981e3e7b45b8f4f9607f62
Parents: a00c51b
Author: Sudheer Vinukonda <su...@yahoo-inc.com>
Authored: Wed May 27 18:48:42 2015 +0000
Committer: Sudheer Vinukonda <su...@yahoo-inc.com>
Committed: Wed May 27 18:48:42 2015 +0000
----------------------------------------------------------------------
CHANGES | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/349fb2f5/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 35222fc..4ac2033 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 6.0.0
+ *) [TS-3642]: fix reading of proxy.config.http.share_server_sessions
+
*) [TS-3631] Add config option to limit post size
*) [TS-3628] Unable to use disks larger than 16T