trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject trafficserver git commit: TS-3651: Update documents to remove references to old server session sharing. Make sharing pool not overridable.
Date Fri, 19 Jun 2015 22:24:05 GMT
Repository: trafficserver
Updated Branches:
  refs/heads/master 8b4930e3b -> 6d0f65a67


TS-3651: Update documents to remove references to old server session sharing. Make sharing
pool not overridable.


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

Branch: refs/heads/master
Commit: 6d0f65a671c8e1440d8b0d5d6051f17052218b77
Parents: 8b4930e
Author: Alan M. Carroll <solidwallofcode@yahoo-inc.com>
Authored: Fri Jun 19 09:49:30 2015 -0500
Committer: Alan M. Carroll <solidwallofcode@yahoo-inc.com>
Committed: Fri Jun 19 17:22:17 2015 -0500

----------------------------------------------------------------------
 lib/ts/apidefs.h.in                             |  1 -
 .../stale_while_revalidate.c                    |  2 +-
 .../experimental/ts_lua/ts_lua_http_config.c    |  2 -
 proxy/InkAPI.cc                                 |  7 --
 proxy/InkAPITest.cc                             | 73 ++++++++++----------
 proxy/http/HttpConfig.cc                        | 13 ----
 proxy/http/HttpConfig.h                         |  6 +-
 proxy/http/HttpSM.cc                            |  4 +-
 proxy/http/HttpSessionManager.cc                |  2 +-
 9 files changed, 43 insertions(+), 67 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6d0f65a6/lib/ts/apidefs.h.in
----------------------------------------------------------------------
diff --git a/lib/ts/apidefs.h.in b/lib/ts/apidefs.h.in
index 6379b8f..aa510ff 100644
--- a/lib/ts/apidefs.h.in
+++ b/lib/ts/apidefs.h.in
@@ -594,7 +594,6 @@ typedef enum {
   TS_CONFIG_HTTP_KEEP_ALIVE_ENABLED_IN,
   TS_CONFIG_HTTP_KEEP_ALIVE_ENABLED_OUT,
   TS_CONFIG_HTTP_KEEP_ALIVE_POST_OUT,
-  TS_CONFIG_HTTP_SERVER_SESSION_SHARING_POOL,
   TS_CONFIG_HTTP_SERVER_SESSION_SHARING_MATCH,
   TS_CONFIG_NET_SOCK_RECV_BUFFER_SIZE_OUT,
   TS_CONFIG_NET_SOCK_SEND_BUFFER_SIZE_OUT,

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6d0f65a6/plugins/experimental/stale_while_revalidate/stale_while_revalidate.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/stale_while_revalidate/stale_while_revalidate.c b/plugins/experimental/stale_while_revalidate/stale_while_revalidate.c
index 6576e7d..13beae7 100644
--- a/plugins/experimental/stale_while_revalidate/stale_while_revalidate.c
+++ b/plugins/experimental/stale_while_revalidate/stale_while_revalidate.c
@@ -484,7 +484,7 @@ main_plugin(TSCont cont, TSEvent event, void *edata)
       TSHttpTxnHookAdd(txn, TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK, cont);
     } else {
       TSDebug(PLUGIN_NAME, "Internal Request"); // This is insufficient if there are other
plugins using TSHttpConnect
-      TSHttpTxnConfigIntSet(txn, TS_CONFIG_HTTP_SERVER_SESSION_SHARING_POOL, TS_SERVER_SESSION_SHARING_POOL_GLOBAL);
+      TSHttpTxnConfigIntSet(txn, TS_CONFIG_HTTP_SERVER_SESSION_SHARING_MATCH, TS_SERVER_SESSION_SHARING_MATCH_NONE);
       // TSHttpTxnHookAdd(txn, TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK, cont);
       TSHttpTxnHookAdd(txn, TS_HTTP_READ_RESPONSE_HDR_HOOK, cont);
       // This might be needed in 3.2.0 to fix a timeout issue

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6d0f65a6/plugins/experimental/ts_lua/ts_lua_http_config.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_http_config.c b/plugins/experimental/ts_lua/ts_lua_http_config.c
index 284cd19..f6a5182 100644
--- a/plugins/experimental/ts_lua/ts_lua_http_config.c
+++ b/plugins/experimental/ts_lua/ts_lua_http_config.c
@@ -29,7 +29,6 @@ typedef enum {
   TS_LUA_CONFIG_HTTP_KEEP_ALIVE_ENABLED_OUT = TS_CONFIG_HTTP_KEEP_ALIVE_ENABLED_OUT,
   TS_LUA_CONFIG_HTTP_KEEP_ALIVE_POST_OUT = TS_CONFIG_HTTP_KEEP_ALIVE_POST_OUT,
   TS_LUA_CONFIG_HTTP_SERVER_SESSION_SHARING_MATCH = TS_CONFIG_HTTP_SERVER_SESSION_SHARING_MATCH,
-  TS_LUA_CONFIG_HTTP_SERVER_SESSION_SHARING_POOL = TS_CONFIG_HTTP_SERVER_SESSION_SHARING_POOL,
   TS_LUA_CONFIG_NET_SOCK_RECV_BUFFER_SIZE_OUT = TS_CONFIG_NET_SOCK_RECV_BUFFER_SIZE_OUT,
   TS_LUA_CONFIG_NET_SOCK_SEND_BUFFER_SIZE_OUT = TS_CONFIG_NET_SOCK_SEND_BUFFER_SIZE_OUT,
   TS_LUA_CONFIG_NET_SOCK_OPTION_FLAG_OUT = TS_CONFIG_NET_SOCK_OPTION_FLAG_OUT,
@@ -100,7 +99,6 @@ ts_lua_var_item ts_lua_http_config_vars[] = {
   TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CACHE_WHEN_TO_REVALIDATE), TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_KEEP_ALIVE_ENABLED_IN),
   TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_KEEP_ALIVE_ENABLED_OUT), TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_KEEP_ALIVE_POST_OUT),
   TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_SERVER_SESSION_SHARING_MATCH),
-  TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_SERVER_SESSION_SHARING_POOL),
   TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_NET_SOCK_RECV_BUFFER_SIZE_OUT),
   TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_NET_SOCK_SEND_BUFFER_SIZE_OUT), TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_NET_SOCK_OPTION_FLAG_OUT),
   TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_FORWARD_PROXY_AUTH_TO_PARENT),

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6d0f65a6/proxy/InkAPI.cc
----------------------------------------------------------------------
diff --git a/proxy/InkAPI.cc b/proxy/InkAPI.cc
index 1e4093d..d5d354d 100644
--- a/proxy/InkAPI.cc
+++ b/proxy/InkAPI.cc
@@ -7694,9 +7694,6 @@ _conf_to_memberp(TSOverridableConfigKey conf, OverridableHttpConfigParams
*overr
   case TS_CONFIG_HTTP_AUTH_SERVER_SESSION_PRIVATE:
     ret = &overridableHttpConfig->auth_server_session_private;
     break;
-  case TS_CONFIG_HTTP_SERVER_SESSION_SHARING_POOL:
-    ret = &overridableHttpConfig->server_session_sharing_pool;
-    break;
   case TS_CONFIG_HTTP_SERVER_SESSION_SHARING_MATCH:
     ret = &overridableHttpConfig->server_session_sharing_match;
     break;
@@ -8437,10 +8434,6 @@ TSHttpTxnConfigFind(const char *name, int length, TSOverridableConfigKey
*conf,
       else if (!strncmp(name, "proxy.config.http.cache.max_open_read_retries", length))
         cnf = TS_CONFIG_HTTP_CACHE_MAX_OPEN_READ_RETRIES;
       break;
-    case 'l':
-      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;

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6d0f65a6/proxy/InkAPITest.cc
----------------------------------------------------------------------
diff --git a/proxy/InkAPITest.cc b/proxy/InkAPITest.cc
index f5058e5..25b99da 100644
--- a/proxy/InkAPITest.cc
+++ b/proxy/InkAPITest.cc
@@ -7169,43 +7169,42 @@ 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.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", "proxy.config.http.forward.proxy_auth_to_parent",
-  "proxy.config.http.anonymize_remove_from", "proxy.config.http.anonymize_remove_referer",
-  "proxy.config.http.anonymize_remove_user_agent", "proxy.config.http.anonymize_remove_cookie",
-  "proxy.config.http.anonymize_remove_client_ip", "proxy.config.http.anonymize_insert_client_ip",
-  "proxy.config.http.response_server_enabled", "proxy.config.http.insert_squid_x_forwarded_for",
-  "proxy.config.http.server_tcp_init_cwnd", "proxy.config.http.send_http11_requests", "proxy.config.http.cache.http",
-  "proxy.config.http.cache.cluster_cache_local", "proxy.config.http.cache.ignore_client_no_cache",
-  "proxy.config.http.cache.ignore_client_cc_max_age", "proxy.config.http.cache.ims_on_client_no_cache",
-  "proxy.config.http.cache.ignore_server_no_cache", "proxy.config.http.cache.cache_responses_to_cookies",
-  "proxy.config.http.cache.ignore_authentication", "proxy.config.http.cache.cache_urls_that_look_dynamic",
-  "proxy.config.http.cache.required_headers", "proxy.config.http.insert_request_via_str",
-  "proxy.config.http.insert_response_via_str", "proxy.config.http.cache.heuristic_min_lifetime",
-  "proxy.config.http.cache.heuristic_max_lifetime", "proxy.config.http.cache.guaranteed_min_lifetime",
-  "proxy.config.http.cache.guaranteed_max_lifetime", "proxy.config.http.cache.max_stale_age",
-  "proxy.config.http.keep_alive_no_activity_timeout_in", "proxy.config.http.keep_alive_no_activity_timeout_out",
-  "proxy.config.http.transaction_no_activity_timeout_in", "proxy.config.http.transaction_no_activity_timeout_out",
-  "proxy.config.http.transaction_active_timeout_out", "proxy.config.http.origin_max_connections",
-  "proxy.config.http.connect_attempts_max_retries", "proxy.config.http.connect_attempts_max_retries_dead_server",
-  "proxy.config.http.connect_attempts_rr_retries", "proxy.config.http.connect_attempts_timeout",
-  "proxy.config.http.post_connect_attempts_timeout", "proxy.config.http.down_server.cache_time",
-  "proxy.config.http.down_server.abort_threshold", "proxy.config.http.cache.fuzz.time", "proxy.config.http.cache.fuzz.min_time",
-  "proxy.config.http.doc_in_cache_skip_dns", "proxy.config.http.background_fill_active_timeout",
-  "proxy.config.http.response_server_str", "proxy.config.http.cache.heuristic_lm_factor",
-  "proxy.config.http.cache.fuzz.probability", "proxy.config.http.background_fill_completed_threshold",
-  "proxy.config.net.sock_packet_mark_out", "proxy.config.net.sock_packet_tos_out", "proxy.config.http.insert_age_in_response",
-  "proxy.config.http.chunking.size", "proxy.config.http.flow_control.enabled", "proxy.config.http.flow_control.low_water",
-  "proxy.config.http.flow_control.high_water", "proxy.config.http.cache.range.lookup", "proxy.config.http.normalize_ae_gzip",
-  "proxy.config.http.default_buffer_size", "proxy.config.http.default_buffer_water_mark",
-  "proxy.config.http.request_header_max_size", "proxy.config.http.response_header_max_size",
-  "proxy.config.http.negative_revalidating_enabled", "proxy.config.http.negative_revalidating_lifetime",
-  "proxy.config.http.accept_encoding_filter_enabled", "proxy.config.ssl.hsts_max_age", "proxy.config.ssl.hsts_include_subdomains",
-  "proxy.config.http.cache.open_read_retry_time", "proxy.config.http.cache.max_open_read_retries",
-  "proxy.config.http.cache.range.write", "proxy.config.http.post.check.content_length.enabled",
-  "proxy.config.http.global_user_agent_header", "proxy.config.http.auth_server_session_private",
-  "proxy.config.http.slow.log.threshold", "proxy.config.http.cache.generation"};
+  "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",
+  "proxy.config.http.forward.proxy_auth_to_parent", "proxy.config.http.anonymize_remove_from",
+  "proxy.config.http.anonymize_remove_referer", "proxy.config.http.anonymize_remove_user_agent",
+  "proxy.config.http.anonymize_remove_cookie", "proxy.config.http.anonymize_remove_client_ip",
+  "proxy.config.http.anonymize_insert_client_ip", "proxy.config.http.response_server_enabled",
+  "proxy.config.http.insert_squid_x_forwarded_for", "proxy.config.http.server_tcp_init_cwnd",
+  "proxy.config.http.send_http11_requests", "proxy.config.http.cache.http", "proxy.config.http.cache.cluster_cache_local",
+  "proxy.config.http.cache.ignore_client_no_cache", "proxy.config.http.cache.ignore_client_cc_max_age",
+  "proxy.config.http.cache.ims_on_client_no_cache", "proxy.config.http.cache.ignore_server_no_cache",
+  "proxy.config.http.cache.cache_responses_to_cookies", "proxy.config.http.cache.ignore_authentication",
+  "proxy.config.http.cache.cache_urls_that_look_dynamic", "proxy.config.http.cache.required_headers",
+  "proxy.config.http.insert_request_via_str", "proxy.config.http.insert_response_via_str",
+  "proxy.config.http.cache.heuristic_min_lifetime", "proxy.config.http.cache.heuristic_max_lifetime",
+  "proxy.config.http.cache.guaranteed_min_lifetime", "proxy.config.http.cache.guaranteed_max_lifetime",
+  "proxy.config.http.cache.max_stale_age", "proxy.config.http.keep_alive_no_activity_timeout_in",
+  "proxy.config.http.keep_alive_no_activity_timeout_out", "proxy.config.http.transaction_no_activity_timeout_in",
+  "proxy.config.http.transaction_no_activity_timeout_out", "proxy.config.http.transaction_active_timeout_out",
+  "proxy.config.http.origin_max_connections", "proxy.config.http.connect_attempts_max_retries",
+  "proxy.config.http.connect_attempts_max_retries_dead_server", "proxy.config.http.connect_attempts_rr_retries",
+  "proxy.config.http.connect_attempts_timeout", "proxy.config.http.post_connect_attempts_timeout",
+  "proxy.config.http.down_server.cache_time", "proxy.config.http.down_server.abort_threshold",
"proxy.config.http.cache.fuzz.time",
+  "proxy.config.http.cache.fuzz.min_time", "proxy.config.http.doc_in_cache_skip_dns",
+  "proxy.config.http.background_fill_active_timeout", "proxy.config.http.response_server_str",
+  "proxy.config.http.cache.heuristic_lm_factor", "proxy.config.http.cache.fuzz.probability",
+  "proxy.config.http.background_fill_completed_threshold", "proxy.config.net.sock_packet_mark_out",
+  "proxy.config.net.sock_packet_tos_out", "proxy.config.http.insert_age_in_response", "proxy.config.http.chunking.size",
+  "proxy.config.http.flow_control.enabled", "proxy.config.http.flow_control.low_water", "proxy.config.http.flow_control.high_water",
+  "proxy.config.http.cache.range.lookup", "proxy.config.http.normalize_ae_gzip", "proxy.config.http.default_buffer_size",
+  "proxy.config.http.default_buffer_water_mark", "proxy.config.http.request_header_max_size",
+  "proxy.config.http.response_header_max_size", "proxy.config.http.negative_revalidating_enabled",
+  "proxy.config.http.negative_revalidating_lifetime", "proxy.config.http.accept_encoding_filter_enabled",
+  "proxy.config.ssl.hsts_max_age", "proxy.config.ssl.hsts_include_subdomains", "proxy.config.http.cache.open_read_retry_time",
+  "proxy.config.http.cache.max_open_read_retries", "proxy.config.http.cache.range.write",
+  "proxy.config.http.post.check.content_length.enabled", "proxy.config.http.global_user_agent_header",
+  "proxy.config.http.auth_server_session_private", "proxy.config.http.slow.log.threshold",
"proxy.config.http.cache.generation"};
 
 REGRESSION_TEST(SDK_API_OVERRIDABLE_CONFIGS)(RegressionTest *test, int /* atype ATS_UNUSED
*/, int *pstatus)
 {

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6d0f65a6/proxy/http/HttpConfig.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpConfig.cc b/proxy/http/HttpConfig.cc
index ffe2b33..77de7b2 100644
--- a/proxy/http/HttpConfig.cc
+++ b/proxy/http/HttpConfig.cc
@@ -173,15 +173,6 @@ 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.pool", name)) {
-    MgmtByte &match = c->oride.server_session_sharing_pool;
-    if (RECD_INT == dtype) {
-      match = static_cast<TSServerSessionSharingPoolType>(data.rec_int);
-    } else if (RECD_STRING == dtype && http_config_enum_search(data.rec_string, SessionSharingPoolStrings,
match)) {
-      // empty
-    } else {
-      valid_p = false;
-    }
   } else {
     valid_p = false;
   }
@@ -939,9 +930,6 @@ HttpConfig::startup()
   HttpEstablishStaticConfigByte(c.oride.post_check_content_length_enabled, "proxy.config.http.post.check.content_length.enabled");
 
   // [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);
-  http_config_enum_read("proxy.config.http.server_session_sharing.pool", SessionSharingPoolStrings,
-                        c.oride.server_session_sharing_pool);
   RecRegisterConfigUpdateCb("proxy.config.http.server_session_sharing.match", &http_server_session_sharing_cb,
&c);
   http_config_enum_read("proxy.config.http.server_session_sharing.match", SessionSharingMatchStrings,
                         c.oride.server_session_sharing_match);
@@ -1217,7 +1205,6 @@ HttpConfig::reconfigure()
     params->oride.flow_high_water_mark = params->oride.flow_low_water_mark = 0;
   }
 
-  params->oride.server_session_sharing_pool = m_master.oride.server_session_sharing_pool;
   params->oride.server_session_sharing_match = m_master.oride.server_session_sharing_match;
   params->oride.keep_alive_post_out = m_master.oride.keep_alive_post_out;
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6d0f65a6/proxy/http/HttpConfig.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpConfig.h b/proxy/http/HttpConfig.h
index 52c4412..37ddc72 100644
--- a/proxy/http/HttpConfig.h
+++ b/proxy/http/HttpConfig.h
@@ -362,8 +362,7 @@ struct OverridableHttpConfigParams {
   OverridableHttpConfigParams()
     : maintain_pristine_host_hdr(1), chunking_enabled(1), negative_caching_enabled(0), negative_revalidating_enabled(0),
       cache_when_to_revalidate(0), keep_alive_enabled_in(1), keep_alive_enabled_out(1), keep_alive_post_out(1),
-      server_session_sharing_match(TS_SERVER_SESSION_SHARING_MATCH_BOTH),
-      server_session_sharing_pool(TS_SERVER_SESSION_SHARING_POOL_THREAD), auth_server_session_private(1),
+      server_session_sharing_match(TS_SERVER_SESSION_SHARING_MATCH_BOTH), auth_server_session_private(1),
       fwd_proxy_auth_to_parent(0), insert_age_in_response(1), anonymize_remove_from(0), anonymize_remove_referer(0),
       anonymize_remove_user_agent(0), anonymize_remove_cookie(0), anonymize_remove_client_ip(0),
anonymize_insert_client_ip(1),
       proxy_response_server_enabled(1), proxy_response_hsts_max_age(-1), proxy_response_hsts_include_subdomains(0),
@@ -412,7 +411,6 @@ struct OverridableHttpConfigParams {
   MgmtByte keep_alive_post_out; // share server sessions for post
 
   MgmtByte server_session_sharing_match;
-  MgmtByte server_session_sharing_pool;
   //  MgmtByte share_server_sessions;
   MgmtByte auth_server_session_private;
   MgmtByte fwd_proxy_auth_to_parent;
@@ -746,6 +744,8 @@ public:
   MgmtInt cache_open_write_fail_action;
   MgmtInt max_post_size;
 
+  MgmtByte server_session_sharing_pool;
+
   OverridableHttpConfigParams oride;
 
   ////////////////////

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6d0f65a6/proxy/http/HttpSM.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index 6bbacbe..2942649 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -1576,10 +1576,10 @@ HttpSM::state_http_server_open(int event, void *data)
 
   switch (event) {
   case NET_EVENT_OPEN:
-    session = (TS_SERVER_SESSION_SHARING_POOL_THREAD == t_state.txn_conf->server_session_sharing_pool)
?
+    session = (TS_SERVER_SESSION_SHARING_POOL_THREAD == t_state.http_config_param->server_session_sharing_pool)
?
                 THREAD_ALLOC_INIT(httpServerSessionAllocator, mutex->thread_holding) :
                 httpServerSessionAllocator.alloc();
-    session->sharing_pool = static_cast<TSServerSessionSharingPoolType>(t_state.txn_conf->server_session_sharing_pool);
+    session->sharing_pool = static_cast<TSServerSessionSharingPoolType>(t_state.http_config_param->server_session_sharing_pool);
     session->sharing_match = static_cast<TSServerSessionSharingMatchType>(t_state.txn_conf->server_session_sharing_match);
     // If origin_max_connections or origin_min_keep_alive_connections is
     // set then we are metering the max and or min number

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6d0f65a6/proxy/http/HttpSessionManager.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpSessionManager.cc b/proxy/http/HttpSessionManager.cc
index 611e781..c490515 100644
--- a/proxy/http/HttpSessionManager.cc
+++ b/proxy/http/HttpSessionManager.cc
@@ -265,7 +265,7 @@ HttpSessionManager::acquire_session(Continuation * /* cont ATS_UNUSED
*/, sockad
   // Now check to see if we have a connection in our shared connection pool
   EThread *ethread = this_ethread();
 
-  if (TS_SERVER_SESSION_SHARING_POOL_THREAD == sm->t_state.txn_conf->server_session_sharing_pool)
{
+  if (TS_SERVER_SESSION_SHARING_POOL_THREAD == sm->t_state.http_config_param->server_session_sharing_pool)
{
     to_return = ethread->server_session_pool->acquireSession(ip, hostname_hash, match_style);
   } else {
     MUTEX_TRY_LOCK(lock, m_g_pool->mutex, ethread);


Mime
View raw message