trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bri...@apache.org
Subject [1/2] trafficserver git commit: TS-3664: WebSockets attempts cache lookup and blocks on multiple requests
Date Thu, 04 Jun 2015 06:35:34 GMT
Repository: trafficserver
Updated Branches:
  refs/heads/master 2d8113098 -> e8b38aea0


TS-3664: WebSockets attempts cache lookup and blocks on multiple requests


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

Branch: refs/heads/master
Commit: 8ee26db7919d76e464a203c0d4d7f2d8f98c041d
Parents: 2d81130
Author: Brian Geffon <briang@apache.org>
Authored: Wed Jun 3 23:35:06 2015 -0700
Committer: Brian Geffon <briang@apache.org>
Committed: Wed Jun 3 23:35:06 2015 -0700

----------------------------------------------------------------------
 proxy/http/HttpTransact.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8ee26db7/proxy/http/HttpTransact.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index 961d78b..7e0e6d3 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -1878,7 +1878,7 @@ HttpTransact::DecideCacheLookup(State *s)
     s->cache_info.action = CACHE_DO_NO_ACTION;
     s->current.mode = GENERIC_PROXY;
   } else {
-    if (is_request_cache_lookupable(s)) {
+    if (is_request_cache_lookupable(s) && !s->is_upgrade_request) {
       s->cache_info.action = CACHE_DO_LOOKUP;
       s->current.mode = GENERIC_PROXY;
     } else {


Mime
View raw message