You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2014/01/27 22:26:36 UTC
[1/3] git commit: TS-2290 Remove X-ID special log tag,
and cleanup HdrToken confusion
Updated Branches:
refs/heads/5.0.x a8cba7c78 -> 10dc9f728
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/5.0.x
Commit: 9204df8e4537bfd5cf923f743b9368ff92009c4d
Parents: 77e2776
Author: Leif Hedstrom <zw...@apache.org>
Authored: Thu Jan 23 06:36:32 2014 -0700
Committer: Leif Hedstrom <zw...@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
[3/3] git commit: ADded TS-2290 to CHANGES.
Posted by zw...@apache.org.
ADded TS-2290 to CHANGES.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/10dc9f72
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/10dc9f72
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/10dc9f72
Branch: refs/heads/5.0.x
Commit: 10dc9f7289b8cfb4550763f6698452e936a28293
Parents: 54bb317
Author: Leif Hedstrom <zw...@apache.org>
Authored: Mon Jan 27 14:22:48 2014 -0700
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Mon Jan 27 14:22:48 2014 -0700
----------------------------------------------------------------------
CHANGES | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/10dc9f72/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 8a00765..34b2940 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 5.0.0
+ *) [TS-2290] Remove X-ID special log tag, and cleanup HdrToken confusion.
+
*) [TS-2088] Change TSRecordType enum values to powers of two
Changes with Apache Traffic Server 4.2.0
[2/3] git commit: Merge branch 'TS-2290' into 5.0.x TS-2290 Remove
X-ID special log tag, and cleanup HdrToken confusion
Posted by zw...@apache.org.
Merge branch 'TS-2290' into 5.0.x
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/54bb317a
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/54bb317a
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/54bb317a
Branch: refs/heads/5.0.x
Commit: 54bb317ac4d5dc776a6773ad2bae9ae5ac653662
Parents: a8cba7c 9204df8
Author: Leif Hedstrom <zw...@apache.org>
Authored: Mon Jan 27 14:21:45 2014 -0700
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Mon Jan 27 14:21:45 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(-)
----------------------------------------------------------------------