You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by sh...@apache.org on 2020/12/22 20:19:14 UTC

[trafficserver] branch master updated: Remove unused MAYBE_ABORT state (#7400)

This is an automated email from the ASF dual-hosted git repository.

shinrich pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new 0765293  Remove unused MAYBE_ABORT state (#7400)
0765293 is described below

commit 0765293317162b5549e52580f51164e7123ecc24
Author: Susan Hinrichs <sh...@yahoo-inc.com>
AuthorDate: Tue Dec 22 14:19:05 2020 -0600

    Remove unused MAYBE_ABORT state (#7400)
---
 proxy/http/HttpSM.cc       | 1 -
 proxy/http/HttpTransact.cc | 2 --
 proxy/http/HttpTransact.h  | 1 -
 3 files changed, 4 deletions(-)

diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index 6991b95..8e5f46d 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -5374,7 +5374,6 @@ HttpSM::set_ua_abort(HttpTransact::AbortState_t ua_abort, int event)
 
   switch (ua_abort) {
   case HttpTransact::ABORTED:
-  case HttpTransact::MAYBE_ABORTED:
     // More detailed client side abort logging based on event
     switch (event) {
     case VC_EVENT_ERROR:
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index ebec4d3..85ea71b 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -8340,8 +8340,6 @@ HttpTransact::client_result_stat(State *s, ink_hrtime total_time, ink_hrtime req
   //////////////////////////////////////////
   if (s->client_info.abort == ABORTED) {
     client_transaction_result = CLIENT_TRANSACTION_RESULT_ERROR_ABORT;
-  } else if (s->client_info.abort == MAYBE_ABORTED) {
-    client_transaction_result = CLIENT_TRANSACTION_RESULT_ERROR_POSSIBLE_ABORT;
   }
   // Count the status codes, assuming the client didn't abort (i.e. there is an m_http)
   if ((s->source != SOURCE_NONE) && (s->client_info.abort == DIDNOT_ABORT)) {
diff --git a/proxy/http/HttpTransact.h b/proxy/http/HttpTransact.h
index 5bce8fb..f65d5d2 100644
--- a/proxy/http/HttpTransact.h
+++ b/proxy/http/HttpTransact.h
@@ -219,7 +219,6 @@ public:
   enum AbortState_t {
     ABORT_UNDEFINED = 0,
     DIDNOT_ABORT,
-    MAYBE_ABORTED,
     ABORTED,
   };