This is an automated email from the ASF dual-hosted git repository. sorber pushed a commit to branch 6.2.x in repository https://git-dual.apache.org/repos/asf/trafficserver.git
commit 35c8bf91f54b9ff80fa4361c98ecfec5a90c75c1 Author: Thomas Jackson <jackso...@apache.org> AuthorDate: Wed Apr 6 18:58:12 2016 -0700 Revert "TS-3440: Connect retries shouldn't happen if the connection has succeeeded and data has been sent" This reverts commit 440a14513e59baf21e55b07f0dd4aa39bac232de. Conflicts: proxy/http/HttpTransact.cc (cherry picked from commit 59c3ed195acc2cac719eade3981411ab97cb4b6e) --- proxy/http/HttpTransact.cc | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc index 8c7e119..b75850a 100644 --- a/proxy/http/HttpTransact.cc +++ b/proxy/http/HttpTransact.cc @@ -3717,19 +3717,6 @@ HttpTransact::handle_response_from_server(State *s) s->current.server->set_connect_fail(EUSERS); // too many users handle_server_connection_not_open(s); break; - case CONNECTION_CLOSED: - /* fall through */ - case PARSE_ERROR: - /* fall through */ - case BAD_INCOMING_RESPONSE: { - // this case should not be allowed to retry because we'll end up making another request - 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; - break; - } case OPEN_RAW_ERROR: /* fall through */ case CONNECTION_ERROR: @@ -3737,6 +3724,12 @@ HttpTransact::handle_response_from_server(State *s) case STATE_UNDEFINED: /* fall through */ case INACTIVE_TIMEOUT: + /* fall through */ + case PARSE_ERROR: + /* fall through */ + case CONNECTION_CLOSED: + /* fall through */ + case BAD_INCOMING_RESPONSE: // Set to generic I/O error if not already set specifically. if (!s->current.server->had_connect_fail()) s->current.server->set_connect_fail(EIO); -- To stop receiving notification emails like this one, please contact "commits@trafficserver.apache.org" <commits@trafficserver.apache.org>.