Repository: trafficserver Updated Branches: refs/heads/master e5069f1b6 -> 030a15d59
TS-3151: Extra check for background fill to avoid crash. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/030a15d5 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/030a15d5 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/030a15d5 Branch: refs/heads/master Commit: 030a15d59fe4d2e071cced011b15d4657c65a5bb Parents: e5069f1 Author: Alan M. Carroll <[email protected]> Authored: Thu Oct 30 10:21:12 2014 -0500 Committer: Alan M. Carroll <[email protected]> Committed: Thu Oct 30 10:21:12 2014 -0500 ---------------------------------------------------------------------- CHANGES | 2 ++ proxy/http/HttpSM.cc | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/030a15d5/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index a4144bc..0f44cc4 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 5.2.0 + *) [TS-3151] Added an extra check for background fills to avoid crash. + *) [TS-3119] Add SO_LINGER socket option support. Author: Kang Li <[email protected]> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/030a15d5/proxy/http/HttpSM.cc ---------------------------------------------------------------------- diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc index 3591f2d..fc97b7e 100644 --- a/proxy/http/HttpSM.cc +++ b/proxy/http/HttpSM.cc @@ -3056,7 +3056,7 @@ HttpSM::is_bg_fill_necessary(HttpTunnelConsumer * c) ink_assert(c->vc_type == HT_HTTP_CLIENT); if (c->producer->alive && // something there to read - server_entry && server_entry->vc && // from an origin server + server_entry && server_entry->vc && server_session->get_netvc() && // from an origin server c->producer->num_consumers > 1 // with someone else reading it ) {
