You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by am...@apache.org on 2014/08/21 19:02:53 UTC
git commit: TS-2970 Fix asserts in transparent passthrough. Closes
#103 pull request.
Repository: trafficserver
Updated Branches:
refs/heads/master 1fe51067b -> dff34bde3
TS-2970 Fix asserts in transparent passthrough. Closes #103 pull request.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/dff34bde
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/dff34bde
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/dff34bde
Branch: refs/heads/master
Commit: dff34bde3abb5f88c3d3bda8346b727a12696ab4
Parents: 1fe5106
Author: shinrich <sh...@network-geographics.com>
Authored: Thu Aug 21 10:01:36 2014 -0500
Committer: Alan M. Carroll <am...@network-geographics.com>
Committed: Thu Aug 21 12:02:33 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/dff34bde/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index c31c2a9..0fc82d7 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-3026] SPDY not forwarding Accept-Encoding for FF
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/dff34bde/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;