Repository: trafficserver Updated Branches: refs/heads/master 619b0390f -> 7abadb724
Revert "TS-3376: traffic_server failed assert s->current.server->had_connect_fail()" This reverts commit 619b0390f711e77b39b82e8791655f7597abbca3. I'm reverting this for two reasons: 1) It doesn't fix the problem. 2) It doesn't format properly with clang-format. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/7abadb72 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/7abadb72 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/7abadb72 Branch: refs/heads/master Commit: 7abadb7242cc783a0bde21762e94316fab24d071 Parents: 619b039 Author: Leif Hedstrom <[email protected]> Authored: Mon Aug 3 13:15:06 2015 -0600 Committer: Leif Hedstrom <[email protected]> Committed: Mon Aug 3 13:15:06 2015 -0600 ---------------------------------------------------------------------- proxy/http/HttpTransact.cc | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7abadb72/proxy/http/HttpTransact.cc ---------------------------------------------------------------------- diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc index 48cf2a0..b63f8bc 100644 --- a/proxy/http/HttpTransact.cc +++ b/proxy/http/HttpTransact.cc @@ -3651,11 +3651,6 @@ HttpTransact::handle_response_from_server(State *s) break; case CONNECTION_CLOSED: /* fall through */ - DebugTxn("http_trans", - "[handle_response_from_server] Transaction received a bad response or a partial response, not retrying..."); - SET_VIA_STRING(VIA_DETAIL_SERVER_CONNECT, VIA_DETAIL_SERVER_FAILURE); - handle_server_connection_not_open(s); - break; case PARSE_ERROR: /* fall through */ case BAD_INCOMING_RESPONSE: { @@ -3663,8 +3658,7 @@ HttpTransact::handle_response_from_server(State *s) DebugTxn("http_trans", "[handle_response_from_server] Transaction received a bad response or a partial response, not retrying..."); SET_VIA_STRING(VIA_DETAIL_SERVER_CONNECT, VIA_DETAIL_SERVER_FAILURE); - handle_server_died(s); - s->next_action = SM_ACTION_SEND_ERROR_CACHE_NOOP; + handle_server_connection_not_open(s); break; } case OPEN_RAW_ERROR:
