Repository: trafficserver Updated Branches: refs/heads/master e5caea81d -> 33a477145
TS-2677 Do not apply path / scheme URL changes in remap when method is CONNECT. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/33a47714 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/33a47714 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/33a47714 Branch: refs/heads/master Commit: 33a47714538289570521b66e04c6d6c099b13280 Parents: e5caea8 Author: Leif Hedstrom <[email protected]> Authored: Fri May 23 13:42:49 2014 -0600 Committer: Leif Hedstrom <[email protected]> Committed: Fri May 23 13:43:33 2014 -0600 ---------------------------------------------------------------------- CHANGES | 5 ++++- proxy/http/remap/RemapPlugins.cc | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/33a47714/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 11da5e1..c589668 100644 --- a/CHANGES +++ b/CHANGES @@ -1,7 +1,10 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 5.0.0 - *) [TS-2308] includedir in config.layout is not used + *) [TS-2677] Don't apply path / scheme URL changes in remap when method is + CONNECT. + + *) [TS-2308] includedir in config.layout is not used. *) [TS-2527] mgmtapi.h should be C style. This is slightly ugly in the core now, but that public struct/union has to be named to be C99 compliant. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/33a47714/proxy/http/remap/RemapPlugins.cc ---------------------------------------------------------------------- diff --git a/proxy/http/remap/RemapPlugins.cc b/proxy/http/remap/RemapPlugins.cc index 27a6420..1b5fda3 100644 --- a/proxy/http/remap/RemapPlugins.cc +++ b/proxy/http/remap/RemapPlugins.cc @@ -123,7 +123,7 @@ RemapPlugins::run_single_remap() // // XXX we could probably optimize this a bit more by keeping a flag and only rewriting the request URL // if no plugin has rewritten it already. - if (_cur == 1) { + if ((_cur == 1) && (HTTP_WKSIDX_CONNECT != _s->hdr_info.client_request.method_get_wksidx())) { Debug("url_rewrite", "plugin did not change host, port or path, copying from mapping rule"); url_rewrite_remap_request(_s->url_map, _request_url); }
