Repository: trafficserver Updated Branches: refs/heads/5.1.x e8b899b0f -> 833cbcc05
TS-2970 Fix asserts in transparent passthrough. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/833cbcc0 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/833cbcc0 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/833cbcc0 Branch: refs/heads/5.1.x Commit: 833cbcc05e5d491330f36c57919a127bdaf15443 Parents: e8b899b Author: shinrich <[email protected]> Authored: Thu Aug 21 10:01:36 2014 -0500 Committer: Alan M. Carroll <[email protected]> Committed: Thu Aug 21 12:05:05 2014 -0500 ---------------------------------------------------------------------- CHANGES | 4 +++- proxy/http/HttpSM.cc | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/833cbcc0/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 1b0091e..2a31cf7 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,7 @@ -*- coding: utf-8 -*- -Changes with Apache Traffic Server 5.1.0 +Changes with Apache Traffic Server 5.2.0 + + *) [TS-2970] Prevent asserts with transparent pass through. *) [TS-2995] Apply TOS/SO marks to client connection in all accept cases. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/833cbcc0/proxy/http/HttpSM.cc ---------------------------------------------------------------------- diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc index 79a22bc..2e54c32 100644 --- a/proxy/http/HttpSM.cc +++ b/proxy/http/HttpSM.cc @@ -680,6 +680,10 @@ HttpSM::state_read_client_request_header(int event, void *data) t_state.transparent_passthrough = true; http_parser_clear(&http_parser); + // Turn off read eventing until we get the + // blind tunnel infrastructure set up + ua_session->get_netvc()->do_io_read(this, 0, NULL); + /* establish blind tunnel */ setup_blind_tunnel_port(); return 0;
