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

[zw...@apache.org]

Author: zwoop
Date: Wed Nov 17 03:23:57 2010
New Revision: 1035914

URL: http://svn.apache.org/viewvc?rev=1035914&view=rev
Log:
TS-520 Rename / modify TSSetCacheUrl() API

This is now named TSCacheUrlSet() to be more inline with what other
setter APIs are named. I've also change the prototype to take the
length argument, i.e.

       TSCacheUrlSet(TSHttpTxn txnp, const char *url, int length)

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

Modified: trafficserver/traffic/trunk/proxy/InkAPI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPI.cc?rev=1035914&r1=1035913&r2=1035914&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPI.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkAPI.cc Wed Nov 17 03:23:57 2010
@@ -4991,8 +4991,7 @@ int
 TSHttpTxnCacheLookupUrlGet(TSHttpTxn txnp, TSMBuffer bufp, TSMLoc obj)
 {
   HttpSM *sm = (HttpSM *) txnp;
-  URL u, *l_url, *o_url;
-  NOWARN_UNUSED(o_url);
+  URL u, *l_url;
 
   if (sm == NULL)
     return 0;
@@ -6549,8 +6548,7 @@ TSCacheRemove(TSCont contp, TSCacheKey k
   FORCE_PLUGIN_MUTEX(contp);
   CacheInfo *info = (CacheInfo *) key;
   INKContInternal *i = (INKContInternal *) contp;
-  return (TSAction)
-    cacheProcessor.remove(i, &info->cache_key, info->frag_type, true, false, info->hostname, info->len);
+  return (TSAction)cacheProcessor.remove(i, &info->cache_key, info->frag_type, true, false, info->hostname, info->len);
 }
 
 TSAction
@@ -7435,18 +7433,20 @@ TSICPCachedRespGet(TSCont contp, TSMBuff
 }
 
 TSReturnCode
-TSSetCacheUrl(TSHttpTxn txnp, const char *url)
+TSCacheUrlSet(TSHttpTxn txnp, const char *url, int length)
 {
   HttpSM *sm = (HttpSM *) txnp;
-  Debug("cache_url", "[TSSetCacheUrl]");
+  Debug("cache_url", "[TSCacheUrlSet]");
 
   if (sm->t_state.cache_info.lookup_url == NULL) {
-    Debug("cache_url", "[TSSetCacheUrl] changing the cache url to: %s", url);
+    Debug("cache_url", "[TSCacheUrlSet] changing the cache url to: %s", url);
+
+    if (length == -1)
+      length = strlen(url);
 
-    int size = strlen(url);
     sm->t_state.cache_info.lookup_url_storage.create(NULL);
     sm->t_state.cache_info.lookup_url = &(sm->t_state.cache_info.lookup_url_storage);
-    sm->t_state.cache_info.lookup_url->parse(url, size);
+    sm->t_state.cache_info.lookup_url->parse(url, length);
   } else {
     return TS_ERROR;
   }

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=1035914&r1=1035913&r2=1035914&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/api/ts/ts.h.in (original)
+++ trafficserver/traffic/trunk/proxy/api/ts/ts.h.in Wed Nov 17 03:23:57 2010
@@ -1886,7 +1886,7 @@ extern "C"
 
   /* --------------------------------------------------------------------------
      cache url */
-  tsapi TSReturnCode TSSetCacheUrl(TSHttpTxn txnp, const char *url);
+  tsapi TSReturnCode TSCacheUrlSet(TSHttpTxn txnp, const char *url, int length);
 
   /* --------------------------------------------------------------------------
      cache plugin */