svn commit: r1142886 - in /trafficserver/traffic/trunk/proxy: InkAPI.cc api/ts/ts.h.in http/HttpSM.cc http/HttpSM.h

[zw...@apache.org]

Author: zwoop
Date: Tue Jul  5 03:29:32 2011
New Revision: 1142886

URL: http://svn.apache.org/viewvc?rev=1142886&view=rev
Log:
TS-862 Need to be able to make keep alive connections not shared on a per-transaction basis.

Author: William Bardwell
Review: leif

Modified:
    trafficserver/traffic/trunk/proxy/InkAPI.cc
    trafficserver/traffic/trunk/proxy/api/ts/ts.h.in
    trafficserver/traffic/trunk/proxy/http/HttpSM.cc
    trafficserver/traffic/trunk/proxy/http/HttpSM.h

Modified: trafficserver/traffic/trunk/proxy/InkAPI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPI.cc?rev=1142886&r1=1142885&r2=1142886&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPI.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkAPI.cc Tue Jul  5 03:29:32 2011
@@ -7868,5 +7868,17 @@ TSHttpTxnConfigFind(const char* name, in
   return ((cnf != TS_CONFIG_NULL) ? TS_SUCCESS: TS_ERROR);
 }
 
+TSReturnCode
+TSHttpTxnPrivateSessionSet(TSHttpTxn txnp, int private_session)
+{
+  if (sdk_sanity_check_txn(txnp) != TS_SUCCESS) {
+    return TS_ERROR;
+  }
+  HttpSM *sm = (HttpSM *) txnp;
+  if (sm->set_server_session_private(private_session)) {
+    return TS_SUCCESS;
+  }
+  return TS_ERROR;
+}
 
 #endif //TS_NO_API

Modified: trafficserver/traffic/trunk/proxy/api/ts/ts.h.in
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/api/ts/ts.h.in?rev=1142886&r1=1142885&r2=1142886&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/api/ts/ts.h.in (original)
+++ trafficserver/traffic/trunk/proxy/api/ts/ts.h.in Tue Jul  5 03:29:32 2011
@@ -2963,6 +2963,7 @@ extern "C"
   tsapi TSReturnCode TSHttpTxnCacheLookupStatusSet(TSHttpTxn txnp, int cachelookup);
   tsapi TSReturnCode TSHttpTxnCacheLookupUrlGet(TSHttpTxn txnp, TSMBuffer bufp, TSMLoc obj);
   tsapi TSReturnCode TSHttpTxnCachedUrlSet(TSHttpTxn txnp, TSMBuffer bufp, TSMLoc obj);
+  tsapi TSReturnCode TSHttpTxnPrivateSessionSet(TSHttpTxn txnp, int private_session);
 
 #ifdef __cplusplus
 }

Modified: trafficserver/traffic/trunk/proxy/http/HttpSM.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/HttpSM.cc?rev=1142886&r1=1142885&r2=1142886&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/HttpSM.cc (original)
+++ trafficserver/traffic/trunk/proxy/http/HttpSM.cc Tue Jul  5 03:29:32 2011
@@ -6923,13 +6923,15 @@ HttpSM::redirect_request(const char *red
   DUMP_HEADER("http_hdrs", &t_state.hdr_info.client_request, sm_id, "Framed Client Request..checking");
 }
 
-void HttpSM::set_http_schedule(Continuation *contp)
+void
+HttpSM::set_http_schedule(Continuation *contp)
 {
   HTTP_SM_SET_DEFAULT_HANDLER(&HttpSM::get_http_schedule);
   schedule_cont = contp;
 }
 
-int HttpSM::get_http_schedule(int event, void * data)
+int
+HttpSM::get_http_schedule(int event, void * data)
 {
   NOWARN_UNUSED(data);
   bool plugin_lock;
@@ -6956,3 +6958,14 @@ int HttpSM::get_http_schedule(int event,
 
   return 0;
 }
+
+bool
+HttpSM::set_server_session_private(bool private_session)
+{
+  if (server_session != NULL) {
+    server_session->private_session = private_session;
+    return true;
+  }
+  return false;
+}
+

Modified: trafficserver/traffic/trunk/proxy/http/HttpSM.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/HttpSM.h?rev=1142886&r1=1142885&r2=1142886&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/HttpSM.h (original)
+++ trafficserver/traffic/trunk/proxy/http/HttpSM.h Tue Jul  5 03:29:32 2011
@@ -509,6 +509,9 @@ protected:
 
 public:
   LINK(HttpSM, debug_link);
+
+public:
+  bool set_server_session_private(bool private_session);
 };
 
 //Function to get the cache_sm object - YTS Team, yamsat