You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2014/05/17 00:11:18 UTC
[1/2] git commit: Indentation ...
Repository: trafficserver
Updated Branches:
refs/heads/master 727811ef0 -> 6af0d4ed8
Indentation ...
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/6af0d4ed
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/6af0d4ed
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/6af0d4ed
Branch: refs/heads/master
Commit: 6af0d4ed8ec141d79de63784e23d349c1612a531
Parents: 5f5ae1b
Author: Leif Hedstrom <zw...@apache.org>
Authored: Fri May 16 15:38:11 2014 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Fri May 16 16:10:29 2014 -0600
----------------------------------------------------------------------
CHANGES | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6af0d4ed/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index aa96ccc..bb630d2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,9 +10,10 @@ Changes with Apache Traffic Server 5.0.0
*) [TS-2788] Make proxy.config.alarm.bin reloadable.
- *) [TS-2811] Error logged in regex_remap when lowercase_substitutions option is used
+ *) [TS-2811] Error logged in regex_remap when lowercase_substitutions option
+ is used.
- *) [TS-2791] SPDY POST transactions failing with ERR_CLIENT_ABORT
+ *) [TS-2791] SPDY POST transactions failing with ERR_CLIENT_ABORT.
*) [TS-2805] Client connections are connecting with SPDY 3 instead of 3.1.
[2/2] git commit: TS-2342 Problem with
cache.cache_responses_to_cookies value 0.
Posted by zw...@apache.org.
TS-2342 Problem with cache.cache_responses_to_cookies value 0.
Nice catch Paul!
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/5f5ae1b5
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/5f5ae1b5
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/5f5ae1b5
Branch: refs/heads/master
Commit: 5f5ae1b5f1f4b51ead2bc966adfd636d3a97d0cb
Parents: 727811e
Author: Paul Marquess <Pa...@owmobility.com>
Authored: Fri May 16 15:36:57 2014 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Fri May 16 16:10:29 2014 -0600
----------------------------------------------------------------------
CHANGES | 3 +++
proxy/http/HttpTransact.cc | 11 +++++++----
2 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5f5ae1b5/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index f772da3..aa96ccc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 5.0.0
+ *) [TS-2342] Problem with cache.cache_responses_to_cookies value 0.
+ Author: Paul Marquess <Pa...@owmobility.com>
+
*) [TS-2751] Remove the ProtocolNetAccept layer.
*) [TS-2815] SSL orgin server connection hangs if ssl handshake is slow
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5f5ae1b5/proxy/http/HttpTransact.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index c646869..732ed4d 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -402,10 +402,7 @@ do_cookies_prevent_caching(int cookies_conf, HTTPHdr* request, HTTPHdr* response
if ((CookiesConfig) cookies_conf == COOKIES_CACHE_ALL) {
return false;
}
- // Do not cache if cookies option is COOKIES_CACHE_NONE
- if ((CookiesConfig) cookies_conf == COOKIES_CACHE_NONE) {
- return true;
- }
+
// It is considered that Set-Cookie headers can be safely ignored
// for non text content types if Cache-Control private is not set.
// This enables a bigger hit rate, which currently outweighs the risk of
@@ -423,6 +420,12 @@ do_cookies_prevent_caching(int cookies_conf, HTTPHdr* request, HTTPHdr* response
|| !cached_request->presence(MIME_PRESENCE_COOKIE))) {
return false;
}
+
+ // Do not cache if cookies option is COOKIES_CACHE_NONE
+ // and a Cookie is detected
+ if ((CookiesConfig) cookies_conf == COOKIES_CACHE_NONE) {
+ return true;
+ }
// All other options depend on the Content-Type
content_type = response->value_get(MIME_FIELD_CONTENT_TYPE, MIME_LEN_CONTENT_TYPE, &str_len);