You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bc...@apache.org on 2014/05/31 02:44:20 UTC
git commit: TS-2845: Commit e6b9cb533 causes problems with
stats_over_http
Repository: trafficserver
Updated Branches:
refs/heads/master 82c14a99b -> 2bf6ef38f
TS-2845: Commit e6b9cb533 causes problems with stats_over_http
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/2bf6ef38
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/2bf6ef38
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/2bf6ef38
Branch: refs/heads/master
Commit: 2bf6ef38f9c5d0efc3b89ad2ebb3322f97c27782
Parents: 82c14a9
Author: Bryan Call <bc...@apache.org>
Authored: Fri May 30 17:43:03 2014 -0700
Committer: Bryan Call <bc...@apache.org>
Committed: Fri May 30 17:43:03 2014 -0700
----------------------------------------------------------------------
CHANGES | 4 +++-
proxy/http/HttpSM.cc | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2bf6ef38/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 6b46da2..c35a52b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 5.0.0
-
+
+ *) [TS-2845] Commit e6b9cb533 causes problems with stats_over_http
+
*) [TS-1981] Url remap and IPAllow method filtering is broken with non-wks method
and add support for arbitrary methods
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2bf6ef38/proxy/http/HttpSM.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index 02afe4a..858499f 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -2792,7 +2792,6 @@ HttpSM::tunnel_handler_server(int event, HttpTunnelProducer * p)
break;
case VC_EVENT_EOS:
t_state.current.server->state = HttpTransact::TRANSACTION_COMPLETE;
- t_state.squid_codes.log_code = SQUID_LOG_ERR_READ_ERROR;
break;
}
@@ -2805,6 +2804,7 @@ HttpSM::tunnel_handler_server(int event, HttpTunnelProducer * p)
t_state.current.server->abort = HttpTransact::ABORTED;
t_state.client_info.keep_alive = HTTP_NO_KEEPALIVE;
t_state.current.server->keep_alive = HTTP_NO_KEEPALIVE;
+ t_state.squid_codes.log_code = SQUID_LOG_ERR_READ_ERROR;
} else {
DebugSM("http", "[%" PRId64 "] [HttpSM::tunnel_handler_server] finishing HTTP tunnel", sm_id);
p->read_success = true;