[15/26] git commit: TS-1919 Backing this change out, since it's been -1'd.

2014-02-04 Thread zwoop 
TS-1919 Backing this change out, since it's been -1'd.

git revert did not handle this nicely, since the trees have
diverged so much. Instead, I simply made 5.0.x identical to
current master.


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

Branch: refs/heads/master
Commit: db67432fce4bc324856c17038269f327a9128efa
Parents: a44a12a
Author: Leif Hedstrom zw...@apache.org
Authored: Fri Jan 3 10:34:36 2014 -0700
Committer: Leif Hedstrom zw...@apache.org
Committed: Fri Jan 3 10:34:36 2014 -0700

--
 CHANGES |   7 +-
 iocore/cache/Cache.cc   |   8 +-
 iocore/cache/CacheRead.cc   |  11 ++-
 iocore/cache/I_Cache.h  |  15 ++--
 iocore/cache/P_CacheInternal.h  |  46 +++-
 iocore/cache/P_CacheTest.h  |   1 +
 iocore/cluster/ClusterCache.cc  |  26 ---
 iocore/cluster/P_ClusterCacheInternal.h |  15 ++--
 iocore/cluster/P_ClusterInline.h|  15 +++-
 proxy/ICP.cc|   3 +-
 proxy/Prefetch.cc   |  19 +++--
 proxy/Prefetch.h|   2 +-
 proxy/http/HttpCacheSM.cc   |   8 +-
 proxy/http/HttpCacheSM.h|   9 ++-
 proxy/http/HttpSM.cc|  16 +++-
 proxy/http/HttpTransact.h   |   2 +
 proxy/http/HttpTransactCache.cc | 107 +--
 proxy/http/HttpTransactCache.h  |  61 +--
 18 files changed, 278 insertions(+), 93 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/db67432f/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 75890e1..2a0771c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,5 @@
  -*- coding: utf-8 -*-
-Changes with Apache Traffic Server 5.0.0
-
-  *) [TS-1919] Eliminate CacheLookupHttpConfig. This breaks cluster
-   compatibility, so all cluster nodes should be upgraded simultaneously.
+Changes with Apache Traffic Server 4.2.0
 
   *) [TS-2467] traffic_shell doesn't work with tcl 8.6.
Author: Ben Aitchison b...@meh.net.nz
@@ -63,8 +60,6 @@ Changes with Apache Traffic Server 5.0.0
 
   *) [TS-2432] Fix a race in aio_err_callblk.
 
-Changes with Apache Traffic Server 4.2.0
-
   *) [TS-2251] Simplify LogBuffer reference counting.
 
   *) [TS-2190] Remove cache.log from the cachurl plugin.

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/db67432f/iocore/cache/Cache.cc
--
diff --git a/iocore/cache/Cache.cc b/iocore/cache/Cache.cc
index e3cf044..711b7c9 100644
--- a/iocore/cache/Cache.cc
+++ b/iocore/cache/Cache.cc
@@ -3413,15 +3413,15 @@ ink_cache_init(ModuleVersion v)
 //
 Action *
 CacheProcessor::open_read(Continuation *cont, URL *url, bool 
cluster_cache_local, CacheHTTPHdr *request,
-  void *context, time_t pin_in_cache, CacheFragType 
type)
+  CacheLookupHttpConfig *params, time_t pin_in_cache, 
CacheFragType type)
 {
 #ifdef CLUSTER_CACHE
   if (cache_clustering_enabled  0  !cluster_cache_local) {
-return open_read_internal(CACHE_OPEN_READ_LONG, cont, (MIOBuffer *) 0, 
url, request, context,
-  (CacheKey *) 0, pin_in_cache, type, (char *) 0, 
0);
+return open_read_internal(CACHE_OPEN_READ_LONG, cont, (MIOBuffer *) 0,
+  url, request, params, (CacheKey *) 0, 
pin_in_cache, type, (char *) 0, 0);
   }
 #endif
-  return caches[type]-open_read(cont, url, request, context, type);
+  return caches[type]-open_read(cont, url, request, params, type);
 }
 
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/db67432f/iocore/cache/CacheRead.cc
--
diff --git a/iocore/cache/CacheRead.cc b/iocore/cache/CacheRead.cc
index e155304..5e8c6ac 100644
--- a/iocore/cache/CacheRead.cc
+++ b/iocore/cache/CacheRead.cc
@@ -90,7 +90,7 @@ Lcallreturn:
 #ifdef HTTP_CACHE
 Action *
 Cache::open_read(Continuation * cont, CacheKey * key, CacheHTTPHdr * request,
- void * context, CacheFragType type, char *hostname, int 
host_len)
+ CacheLookupHttpConfig * params, CacheFragType type, char 
*hostname, int host_len)
 {
 
   if (!CacheProcessor::IsCacheReady(type)) {
@@ -116,7 +116,7 @@ Cache::open_read(Continuation * cont, CacheKey * key, 
CacheHTTPHdr * request,

git commit: TS-1919 Backing this change out, since it's been -1'd.

2014-01-03 Thread zwoop 
Updated Branches:
  refs/heads/5.0.x a44a12ab3 - db67432fc


TS-1919 Backing this change out, since it's been -1'd.

git revert did not handle this nicely, since the trees have
diverged so much. Instead, I simply made 5.0.x identical to
current master.


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

Branch: refs/heads/5.0.x
Commit: db67432fce4bc324856c17038269f327a9128efa
Parents: a44a12a
Author: Leif Hedstrom zw...@apache.org
Authored: Fri Jan 3 10:34:36 2014 -0700
Committer: Leif Hedstrom zw...@apache.org
Committed: Fri Jan 3 10:34:36 2014 -0700

--
 CHANGES |   7 +-
 iocore/cache/Cache.cc   |   8 +-
 iocore/cache/CacheRead.cc   |  11 ++-
 iocore/cache/I_Cache.h  |  15 ++--
 iocore/cache/P_CacheInternal.h  |  46 +++-
 iocore/cache/P_CacheTest.h  |   1 +
 iocore/cluster/ClusterCache.cc  |  26 ---
 iocore/cluster/P_ClusterCacheInternal.h |  15 ++--
 iocore/cluster/P_ClusterInline.h|  15 +++-
 proxy/ICP.cc|   3 +-
 proxy/Prefetch.cc   |  19 +++--
 proxy/Prefetch.h|   2 +-
 proxy/http/HttpCacheSM.cc   |   8 +-
 proxy/http/HttpCacheSM.h|   9 ++-
 proxy/http/HttpSM.cc|  16 +++-
 proxy/http/HttpTransact.h   |   2 +
 proxy/http/HttpTransactCache.cc | 107 +--
 proxy/http/HttpTransactCache.h  |  61 +--
 18 files changed, 278 insertions(+), 93 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/db67432f/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 75890e1..2a0771c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,5 @@
  -*- coding: utf-8 -*-
-Changes with Apache Traffic Server 5.0.0
-
-  *) [TS-1919] Eliminate CacheLookupHttpConfig. This breaks cluster
-   compatibility, so all cluster nodes should be upgraded simultaneously.
+Changes with Apache Traffic Server 4.2.0
 
   *) [TS-2467] traffic_shell doesn't work with tcl 8.6.
Author: Ben Aitchison b...@meh.net.nz
@@ -63,8 +60,6 @@ Changes with Apache Traffic Server 5.0.0
 
   *) [TS-2432] Fix a race in aio_err_callblk.
 
-Changes with Apache Traffic Server 4.2.0
-
   *) [TS-2251] Simplify LogBuffer reference counting.
 
   *) [TS-2190] Remove cache.log from the cachurl plugin.

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/db67432f/iocore/cache/Cache.cc
--
diff --git a/iocore/cache/Cache.cc b/iocore/cache/Cache.cc
index e3cf044..711b7c9 100644
--- a/iocore/cache/Cache.cc
+++ b/iocore/cache/Cache.cc
@@ -3413,15 +3413,15 @@ ink_cache_init(ModuleVersion v)
 //
 Action *
 CacheProcessor::open_read(Continuation *cont, URL *url, bool 
cluster_cache_local, CacheHTTPHdr *request,
-  void *context, time_t pin_in_cache, CacheFragType 
type)
+  CacheLookupHttpConfig *params, time_t pin_in_cache, 
CacheFragType type)
 {
 #ifdef CLUSTER_CACHE
   if (cache_clustering_enabled  0  !cluster_cache_local) {
-return open_read_internal(CACHE_OPEN_READ_LONG, cont, (MIOBuffer *) 0, 
url, request, context,
-  (CacheKey *) 0, pin_in_cache, type, (char *) 0, 
0);
+return open_read_internal(CACHE_OPEN_READ_LONG, cont, (MIOBuffer *) 0,
+  url, request, params, (CacheKey *) 0, 
pin_in_cache, type, (char *) 0, 0);
   }
 #endif
-  return caches[type]-open_read(cont, url, request, context, type);
+  return caches[type]-open_read(cont, url, request, params, type);
 }
 
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/db67432f/iocore/cache/CacheRead.cc
--
diff --git a/iocore/cache/CacheRead.cc b/iocore/cache/CacheRead.cc
index e155304..5e8c6ac 100644
--- a/iocore/cache/CacheRead.cc
+++ b/iocore/cache/CacheRead.cc
@@ -90,7 +90,7 @@ Lcallreturn:
 #ifdef HTTP_CACHE
 Action *
 Cache::open_read(Continuation * cont, CacheKey * key, CacheHTTPHdr * request,
- void * context, CacheFragType type, char *hostname, int 
host_len)
+ CacheLookupHttpConfig * params, CacheFragType type, char 
*hostname, int host_len)
 {
 
   if (!CacheProcessor::IsCacheReady(type)) {
@@ -116,7 +116,7 @@ Cache::open_read(Continuation *