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 2015/12/15 04:17:51 UTC

trafficserver git commit: TS-4056: remove alloc_cache from NetAccept

Repository: trafficserver
Updated Branches:
  refs/heads/master 90e785e87 -> f17e7c6dd


TS-4056: remove alloc_cache from NetAccept

This closes #366


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/f17e7c6d
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/f17e7c6d
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/f17e7c6d

Branch: refs/heads/master
Commit: f17e7c6ddf8d771b3dc21b59360e982c55423c46
Parents: 90e785e
Author: Oknet Xu <xu...@skyguard.com.cn>
Authored: Mon Dec 14 19:17:16 2015 -0800
Committer: Bryan Call <bc...@apache.org>
Committed: Mon Dec 14 19:17:16 2015 -0800

----------------------------------------------------------------------
 proxy/http/HttpSM.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f17e7c6d/proxy/http/HttpSM.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index 188aef5..9ec932c 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -5271,7 +5271,7 @@ HttpSM::handle_server_setup_error(int event, void *data)
     // In case of TIMEOUT, the iocore sends back
     // server_entry->read_vio instead of the write_vio
     // if (vio->op == VIO::WRITE && vio->ndone == 0) {
-    if (server_entry->write_vio->nbytes > 0 && server_entry->write_vio->ndone == 0) {
+    if (server_entry->write_vio && server_entry->write_vio->nbytes > 0 && server_entry->write_vio->ndone == 0) {
       t_state.current.state = HttpTransact::CONNECTION_ERROR;
     } else {
       t_state.current.state = HttpTransact::INACTIVE_TIMEOUT;