[trafficserver] branch master updated: Fix an enum element mismatch between TSServerState and ServerState_t

[ma...@apache.org]

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

maskit 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 995b6ef  Fix an enum element mismatch between TSServerState and ServerState_t
995b6ef is described below

commit 995b6ef9c62fba13e1384728ce72c91604b3466f
Author: Masakazu Kitajo <ma...@apache.org>
AuthorDate: Fri Jan 12 09:38:43 2018 +0900

    Fix an enum element mismatch between TSServerState and ServerState_t
---
 lib/ts/apidefs.h.in       | 3 ++-
 proxy/http/HttpTransact.h | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/ts/apidefs.h.in b/lib/ts/apidefs.h.in
index ee480d2..d10126b 100644
--- a/lib/ts/apidefs.h.in
+++ b/lib/ts/apidefs.h.in
@@ -473,7 +473,8 @@ typedef enum {
   TS_SRVSTATE_PARSE_ERROR,
   TS_SRVSTATE_TRANSACTION_COMPLETE,
   TS_SRVSTATE_CONGEST_CONTROL_CONGESTED_ON_F,
-  TS_SRVSTATE_CONGEST_CONTROL_CONGESTED_ON_M
+  TS_SRVSTATE_CONGEST_CONTROL_CONGESTED_ON_M,
+  TS_SRVSTATE_PARENT_RETRY
 } TSServerState;
 
 typedef enum {
diff --git a/proxy/http/HttpTransact.h b/proxy/http/HttpTransact.h
index ac81b96..c69cdd1 100644
--- a/proxy/http/HttpTransact.h
+++ b/proxy/http/HttpTransact.h
@@ -346,7 +346,7 @@ public:
     TOTAL_RESPONSE_ERROR_TYPES
   };
 
-  // Please do not forget to fix TSServerState (ts/ts.h)
+  // Please do not forget to fix TSServerState (ts/apidefs.h.in)
   // in case of any modifications in ServerState_t
   enum ServerState_t {
     STATE_UNDEFINED = 0,

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].