trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject [18/26] git commit: TS-2290 Remove X-ID special log tag, and cleanup HdrToken confusion
Date Wed, 05 Feb 2014 00:33:12 GMT
TS-2290 Remove X-ID special log tag, and cleanup HdrToken confusion


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

Branch: refs/heads/master
Commit: 9204df8e4537bfd5cf923f743b9368ff92009c4d
Parents: 77e2776
Author: Leif Hedstrom <zwoop@apache.org>
Authored: Thu Jan 23 06:36:32 2014 -0700
Committer: Leif Hedstrom <zwoop@apache.org>
Committed: Mon Jan 27 13:41:00 2014 -0700

----------------------------------------------------------------------
 proxy/hdrs/HdrToken.cc         |  4 ++--
 proxy/logging/Log.cc           |  9 ---------
 proxy/logging/LogAccess.cc     |  9 ---------
 proxy/logging/LogAccess.h      |  1 -
 proxy/logging/LogAccessHttp.cc | 34 ----------------------------------
 proxy/logging/LogAccessHttp.h  |  1 -
 6 files changed, 2 insertions(+), 56 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9204df8e/proxy/hdrs/HdrToken.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/HdrToken.cc b/proxy/hdrs/HdrToken.cc
index 72bbbe1..e976d3e 100644
--- a/proxy/hdrs/HdrToken.cc
+++ b/proxy/hdrs/HdrToken.cc
@@ -177,9 +177,9 @@ static const char *_hdrtoken_strs[] = {
   "PUT",
   "TRACE",
   "PUSH",
-  "X-ID",
   
   // Header extensions
+  "X-ID",
   "X-Forwarded-For",
   "TE",
 };
@@ -505,9 +505,9 @@ static const char *_hdrtoken_commonly_tokenized_strs[] = {
   "PUT",
   "TRACE",
   "PUSH",
-  "X-ID",
   
   // Header extensions
+  "X-ID",
   "X-Forwarded-For",
   "TE",
 };

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9204df8e/proxy/logging/Log.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/Log.cc b/proxy/logging/Log.cc
index ebf0233..462d955 100644
--- a/proxy/logging/Log.cc
+++ b/proxy/logging/Log.cc
@@ -706,15 +706,6 @@ Log::init_fields()
   global_field_list.add(field, false);
   ink_hash_table_insert(field_symbol_hash, "phi", field);
 
-  // X-WAID
-  field = NEW(new LogField("accelerator_id", "xid",
-                           LogField::STRING,
-                           &LogAccess::marshal_client_accelerator_id,
-                           (LogField::UnmarshalFunc)&LogAccess::unmarshal_str));
-  global_field_list.add(field, false);
-  ink_hash_table_insert(field_symbol_hash, "xid", field);
-  // X-WAID
-
   // server -> proxy fields
 
   field = NEW(new LogField("server_host_ip", "shi",

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9204df8e/proxy/logging/LogAccess.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogAccess.cc b/proxy/logging/LogAccess.cc
index 60fc53c..568c759 100644
--- a/proxy/logging/LogAccess.cc
+++ b/proxy/logging/LogAccess.cc
@@ -226,15 +226,6 @@ LogAccess::marshal_client_finish_status_code(char *buf)
   -------------------------------------------------------------------------*/
 
 int
-LogAccess::marshal_client_accelerator_id(char *buf)
-{
-  DEFAULT_STR_FIELD;
-}
-
-/*-------------------------------------------------------------------------
-  -------------------------------------------------------------------------*/
-
-int
 LogAccess::marshal_proxy_resp_content_type(char *buf)
 {
   DEFAULT_STR_FIELD;

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9204df8e/proxy/logging/LogAccess.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogAccess.h b/proxy/logging/LogAccess.h
index 4438f7b..a152de6 100644
--- a/proxy/logging/LogAccess.h
+++ b/proxy/logging/LogAccess.h
@@ -185,7 +185,6 @@ public:
   inkcoreapi virtual int marshal_client_req_header_len(char *); // INT
   inkcoreapi virtual int marshal_client_req_body_len(char *);   // INT
   inkcoreapi virtual int marshal_client_finish_status_code(char *);     // INT
-  inkcoreapi virtual int marshal_client_accelerator_id(char *); // INT
 
   //
   // proxy -> client fields

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9204df8e/proxy/logging/LogAccessHttp.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogAccessHttp.cc b/proxy/logging/LogAccessHttp.cc
index e527fd6..851458c 100644
--- a/proxy/logging/LogAccessHttp.cc
+++ b/proxy/logging/LogAccessHttp.cc
@@ -739,40 +739,6 @@ LogAccessHttp::marshal_server_host_name(char *buf)
   -------------------------------------------------------------------------*/
 
 int
-LogAccessHttp::marshal_client_accelerator_id(char *buf)
-{
-  char *str = NULL;
-  int padded_len = INK_MIN_ALIGN;
-  int actual_len = 0;
-
-  if (Log::config->xuid_logging_enabled) {
-    if (m_client_request) {
-      MIMEField *field = m_client_request->field_find(MIME_FIELD_X_ID, MIME_LEN_X_ID);
-
-      if (field) {
-        str = (char *) field->value_get(&actual_len);
-        /* Ugly subtlety here. marshal_mem, despite the name, adds a
-           terminating nul. It does this at the index actual_len and
-           so requires paddedlen > actual_len (why it can't do the
-           padding calculation escapes me - are there instances where
-           that's different?
-        */
-        padded_len = round_strlen(actual_len+1);
-      }
-    }
-  }
-
-  if (buf) {
-    marshal_mem(buf, str, actual_len, padded_len);
-  }
-  return padded_len;
-}
-
-
-/*-------------------------------------------------------------------------
-  -------------------------------------------------------------------------*/
-
-int
 LogAccessHttp::marshal_server_resp_status_code(char *buf)
 {
   if (buf) {

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9204df8e/proxy/logging/LogAccessHttp.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogAccessHttp.h b/proxy/logging/LogAccessHttp.h
index 4d6abeb..8ca3e8b 100644
--- a/proxy/logging/LogAccessHttp.h
+++ b/proxy/logging/LogAccessHttp.h
@@ -71,7 +71,6 @@ public:
   virtual int marshal_client_req_header_len(char *);    // INT
   virtual int marshal_client_req_body_len(char *);      // INT
   virtual int marshal_client_finish_status_code(char *);        // INT
-  virtual int marshal_client_accelerator_id(char *);    // STR
 
   //
   // proxy -> client fields


Mime
View raw message