[2/3] trafficserver git commit: TS-3558: Fix proxy.config.http.auth_server_session_private

2015-04-27 Thread briang
TS-3558: Fix proxy.config.http.auth_server_session_private


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/300cdbae
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/300cdbae
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/300cdbae

Branch: refs/heads/master
Commit: 300cdbae992eb21d5cca233e91467f7902b726d8
Parents: a1af594
Author: Brian Geffon bri...@apache.org
Authored: Mon Apr 27 19:54:41 2015 -0700
Committer: Brian Geffon bri...@apache.org
Committed: Mon Apr 27 19:54:41 2015 -0700

--
 lib/ts/apidefs.h.in  |  1 +
 proxy/InkAPI.cc  |  7 +++
 proxy/InkAPITest.cc  |  1 +
 proxy/http/HttpConfig.cc |  4 
 proxy/http/HttpSM.cc | 46 ---
 proxy/http/HttpSM.h  |  7 +++
 6 files changed, 50 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/300cdbae/lib/ts/apidefs.h.in
--
diff --git a/lib/ts/apidefs.h.in b/lib/ts/apidefs.h.in
index 329adf2..a3e0d93 100644
--- a/lib/ts/apidefs.h.in
+++ b/lib/ts/apidefs.h.in
@@ -679,6 +679,7 @@ extern C
 TS_CONFIG_HTTP_KEEP_ALIVE_ENABLED_IN,
 TS_CONFIG_HTTP_KEEP_ALIVE_ENABLED_OUT,
 TS_CONFIG_HTTP_KEEP_ALIVE_POST_OUT,
+TS_CONFIG_HTTP_AUTH_SERVER_SESSION_PRIVATE,
 TS_CONFIG_HTTP_SHARE_SERVER_SESSIONS, // DEPRECATED
 TS_CONFIG_HTTP_SERVER_SESSION_SHARING_POOL,
 TS_CONFIG_HTTP_SERVER_SESSION_SHARING_MATCH,

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/300cdbae/proxy/InkAPI.cc
--
diff --git a/proxy/InkAPI.cc b/proxy/InkAPI.cc
index 55def42..cfc1411 100644
--- a/proxy/InkAPI.cc
+++ b/proxy/InkAPI.cc
@@ -7660,6 +7660,9 @@ _conf_to_memberp(TSOverridableConfigKey conf, 
OverridableHttpConfigParams *overr
   case TS_CONFIG_HTTP_KEEP_ALIVE_POST_OUT:
 ret = overridableHttpConfig-keep_alive_post_out;
 break;
+  case TS_CONFIG_HTTP_AUTH_SERVER_SESSION_PRIVATE:
+ret = overridableHttpConfig-auth_server_session_private;
+break;
   case TS_CONFIG_HTTP_SHARE_SERVER_SESSIONS:
 ink_assert(Deprecated config key value - 
TS_CONFIG_HTTP_SHARE_SERVER_SESSIONS);
 //ret = overridableHttpConfig-share_server_sessions;
@@ -8438,6 +8441,10 @@ TSHttpTxnConfigFind(const char *name, int length, 
TSOverridableConfigKey *conf,
   if (0 == strncmp(name, proxy.config.http.server_session_sharing.pool, 
length))
 cnf = TS_CONFIG_HTTP_SERVER_SESSION_SHARING_POOL;
   break;
+case 'e':
+  if (0 == strncmp(name, proxy.config.http.auth_server_session_private, 
length))
+cnf = TS_CONFIG_HTTP_AUTH_SERVER_SESSION_PRIVATE;
+  break;
 }
 break;
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/300cdbae/proxy/InkAPITest.cc
--
diff --git a/proxy/InkAPITest.cc b/proxy/InkAPITest.cc
index de5e319..8a7ec68 100644
--- a/proxy/InkAPITest.cc
+++ b/proxy/InkAPITest.cc
@@ -7170,6 +7170,7 @@ const char *SDK_Overridable_Configs[TS_CONFIG_LAST_ENTRY] 
= {
   proxy.config.url_remap.pristine_host_hdr, 
proxy.config.http.chunking_enabled, 
proxy.config.http.negative_caching_enabled,
   proxy.config.http.negative_caching_lifetime, 
proxy.config.http.cache.when_to_revalidate,
   proxy.config.http.keep_alive_enabled_in, 
proxy.config.http.keep_alive_enabled_out, 
proxy.config.http.keep_alive_post_out,
+  proxy.config.http.auth_server_session_private,
   proxy.config.http.share_server_sessions, 
proxy.config.http.server_session_sharing.pool,
   proxy.config.http.server_session_sharing.match, 
proxy.config.net.sock_recv_buffer_size_out,
   proxy.config.net.sock_send_buffer_size_out, 
proxy.config.net.sock_option_flag_out,

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/300cdbae/proxy/http/HttpConfig.cc
--
diff --git a/proxy/http/HttpConfig.cc b/proxy/http/HttpConfig.cc
index a5bfc63..50d0b45 100644
--- a/proxy/http/HttpConfig.cc
+++ b/proxy/http/HttpConfig.cc
@@ -987,6 +987,8 @@ HttpConfig::startup()
   http_config_enum_read(proxy.config.http.server_session_sharing.match, 
SessionSharingMatchStrings,
 c.oride.server_session_sharing_match);
 
+  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);
 
   HttpEstablishStaticConfigLongLong(c.oride.keep_alive_no_activity_timeout_in,
@@ -1232,6 +1234,8 @@ HttpConfig::reconfigure()
   params-oride.keep_alive_enabled_in = 

[3/3] trafficserver git commit: TS-3558: Update Changes

2015-04-27 Thread briang
TS-3558: Update Changes


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/62d391db
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/62d391db
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/62d391db

Branch: refs/heads/master
Commit: 62d391db901a2eff87ea1a03bf966d19d4ac37be
Parents: 300cdba
Author: Brian Geffon bri...@apache.org
Authored: Mon Apr 27 19:55:05 2015 -0700
Committer: Brian Geffon bri...@apache.org
Committed: Mon Apr 27 19:55:05 2015 -0700

--
 CHANGES | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/62d391db/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 7a81370..3ddf51b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
  -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 6.0.0
 
+  *) [TS-3558] Fix proxy.config.http.auth_server_session_private
+
   *) [TS-3552] Move the check for the api_server_response_no_store flag
earlier.
 



Git Push Summary

2015-04-27 Thread zwoop
Repository: trafficserver
Updated Branches:
  refs/heads/sphinx-docs [deleted] 28041adba


Git Push Summary

2015-04-27 Thread zwoop
Repository: trafficserver
Updated Branches:
  refs/heads/TS-645-hard-restart [deleted] b5c79b2de


Git Push Summary

2015-04-27 Thread zwoop
Repository: trafficserver
Updated Branches:
  refs/heads/test/TS-1570-parse_url-port-fail [deleted] 814141136


Git Push Summary

2015-04-27 Thread zwoop
Repository: trafficserver
Updated Branches:
  refs/heads/ssd [deleted] 403c2e5e3


Git Push Summary

2015-04-27 Thread zwoop
Repository: trafficserver
Updated Branches:
  refs/heads/TS-645 [deleted] fa29002bc