Repository: trafficserver Updated Branches: refs/heads/master e32adda26 -> 7663e6c6f
Fix clang issue in HttpTunnel::consumer_reenable Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/7663e6c6 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/7663e6c6 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/7663e6c6 Branch: refs/heads/master Commit: 7663e6c6fac9be7c5428fb8639d369047a545f83 Parents: e32adda Author: Alan M. Carroll <[email protected]> Authored: Fri Nov 21 09:30:25 2014 -0600 Committer: Alan M. Carroll <[email protected]> Committed: Fri Nov 21 09:30:25 2014 -0600 ---------------------------------------------------------------------- proxy/http/HttpTunnel.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7663e6c6/proxy/http/HttpTunnel.cc ---------------------------------------------------------------------- diff --git a/proxy/http/HttpTunnel.cc b/proxy/http/HttpTunnel.cc index c494868..313789d 100644 --- a/proxy/http/HttpTunnel.cc +++ b/proxy/http/HttpTunnel.cc @@ -1227,9 +1227,8 @@ bool HttpTunnel::consumer_reenable(HttpTunnelConsumer* c) { HttpTunnelProducer* p = c->producer; - HttpTunnelProducer* srcp = p->flow_control_source; - if (p->alive + if (p && p->alive #ifndef LAZY_BUF_ALLOC && p->read_buffer->write_avail() > 0 #endif @@ -1240,6 +1239,7 @@ HttpTunnel::consumer_reenable(HttpTunnelConsumer* c) // greater) to the target, we use strict comparison only for // checking low water, otherwise the flow control can stall out. uint64_t backlog = (flow_state.enabled_p && p->is_source()) ? p->backlog(flow_state.high_water) : 0; + HttpTunnelProducer* srcp = p->flow_control_source; if (backlog >= flow_state.high_water) { if (is_debug_tag_set("http_tunnel"))
