You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by so...@apache.org on 2014/05/29 23:47:17 UTC
[1/2] git commit: TS-2564: Fix race condition when object is in the
ram_cache and presence bits are already recalculated
Repository: trafficserver
Updated Branches:
refs/heads/4.2.x de256a6fe -> 79220c16f
TS-2564: Fix race condition when object is in the ram_cache and presence bits are already recalculated
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/45fb60ef
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/45fb60ef
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/45fb60ef
Branch: refs/heads/4.2.x
Commit: 45fb60efebeff4fc3b2ddba6da74595bc11e2d0f
Parents: de256a6
Author: Alan M. Carroll <am...@network-geographics.com>
Authored: Wed May 28 16:08:24 2014 -0600
Committer: Phil Sorber <so...@apache.org>
Committed: Thu May 29 10:14:45 2014 -0600
----------------------------------------------------------------------
iocore/cache/CacheRead.cc | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/45fb60ef/iocore/cache/CacheRead.cc
----------------------------------------------------------------------
diff --git a/iocore/cache/CacheRead.cc b/iocore/cache/CacheRead.cc
index 7a49707..44cacfa 100644
--- a/iocore/cache/CacheRead.cc
+++ b/iocore/cache/CacheRead.cc
@@ -161,8 +161,9 @@ uint32_t
CacheVC::load_http_info(CacheHTTPInfoVector* info, Doc* doc, RefCountObj * block_ptr)
{
uint32_t zret = info->get_handles(doc->hdr(), doc->hlen, block_ptr);
- if (cache_config_compatibility_4_2_0_fixup &&
- vol->header->version.ink_major == 23 && vol->header->version.ink_minor == 0
+ if (cache_config_compatibility_4_2_0_fixup && // manual override not engaged
+ ! this->f.doc_from_ram_cache && // it's already been done for ram cache objects
+ vol->header->version.ink_major == 23 && vol->header->version.ink_minor == 0 // 4.2.0 version
) {
for ( int i = info->xcount - 1 ; i >= 0 ; --i ) {
info->data(i).alternate.m_alt->m_response_hdr.m_mime->recompute_accelerators_and_presence_bits();
[2/2] git commit: TS-2778: Websockets remap doesn't properly handle
the implicit port for wss.
Posted by so...@apache.org.
TS-2778: Websockets remap doesn't properly handle the implicit port for wss.
(cherry picked from commit 6396c485bab8dbc4255f6790a5711de298b22787)
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/79220c16
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/79220c16
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/79220c16
Branch: refs/heads/4.2.x
Commit: 79220c16fe57b03ee4b6a391e8ba65a5200ed3f0
Parents: 45fb60e
Author: Brian Geffon <br...@apache.org>
Authored: Fri May 2 12:20:56 2014 -0700
Committer: Phil Sorber <so...@apache.org>
Committed: Thu May 29 15:46:20 2014 -0600
----------------------------------------------------------------------
CHANGES | 2 ++
proxy/hdrs/URL.cc | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/79220c16/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index dd515b8..e86d32c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@
Changes with Apache Traffic Server 4.2.2
+ *) [TS-2778] Websockets remap doesn't properly handle the implicit port for wss.
+
Changes with Apache Traffic Server 4.2.1
*) [TS-2624] Force CPU affinity to 0 to mimic previous behavior in 4.x branch
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/79220c16/proxy/hdrs/URL.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/URL.cc b/proxy/hdrs/URL.cc
index 2dea36f..71c0bb7 100644
--- a/proxy/hdrs/URL.cc
+++ b/proxy/hdrs/URL.cc
@@ -396,9 +396,9 @@ url_scheme_set(HdrHeap * heap, URLImpl * url, const char *scheme_str, int scheme
else
scheme_wks = NULL;
- if (scheme_wks == URL_SCHEME_HTTP)
+ if (scheme_wks == URL_SCHEME_HTTP || scheme_wks == URL_SCHEME_WS)
url->m_url_type = URL_TYPE_HTTP;
- else if (scheme_wks == URL_SCHEME_HTTPS)
+ else if (scheme_wks == URL_SCHEME_HTTPS || scheme_wks == URL_SCHEME_WSS)
url->m_url_type = URL_TYPE_HTTPS;
else
url->m_url_type = URL_TYPE_HTTP;