trafficserver git commit: TS-4031: update docs to show new log fields

[jpeach]

Repository: trafficserver
Updated Branches:
  refs/heads/master 4c31cd28b -> b4ed14860


TS-4031: update docs to show new log fields

This closes #341


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

Branch: refs/heads/master
Commit: b4ed14860369bb9806508c2f7bf9aa34e8114aba
Parents: 4c31cd2
Author: Eric Schwartz 
Authored: Tue Nov 17 21:14:18 2015 -0800
Committer: James Peach 
Committed: Tue Nov 17 21:15:28 2015 -0800

--
 .../monitoring/logging/log-formats.en.rst   | 199 +--
 1 file changed, 137 insertions(+), 62 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b4ed1486/doc/admin-guide/monitoring/logging/log-formats.en.rst
--
diff --git a/doc/admin-guide/monitoring/logging/log-formats.en.rst 
b/doc/admin-guide/monitoring/logging/log-formats.en.rst
index 643b85a..e2d497e 100644
--- a/doc/admin-guide/monitoring/logging/log-formats.en.rst
+++ b/doc/admin-guide/monitoring/logging/log-formats.en.rst
@@ -320,7 +320,7 @@ saving your changes to :file:`logs_xml.config`.
 Custom Logging Fields
 -
 
-The following list describes Traffic Server custom logging fields.
+The following list describes |TS| custom logging fields.
 
 .. _cqh:
 
@@ -330,7 +330,7 @@ The following list describes Traffic Server custom logging 
fields.
 ``Accept-Language:`` field in client request headers.
 
 .. note::
-ecqh is the escaped version of this map
+ecqh is the URL-encoded version of this map
 
 .. _pqh:
 
@@ -340,7 +340,7 @@ The following list describes Traffic Server custom logging 
fields.
 the ``Authorization:`` field in proxy request headers.
 
 .. note::
-epqh is the escaped version of this map
+epqh is the URL-encoded version of this map
 
 .. _psh:
 
@@ -350,7 +350,7 @@ The following list describes Traffic Server custom logging 
fields.
 ``Retry-After:`` field in proxy response headers.
 
 .. note::
-epsh is the escaped version of this map
+epsh is the URL-encoded version of this map
 
 .. _ssh:
 
@@ -360,7 +360,7 @@ The following list describes Traffic Server custom logging 
fields.
 server response headers.
 
 .. note::
-essh is the escaped version of this map
+essh is the URL-encoded version of this map
 
 .. _cssh:
 
@@ -370,7 +370,7 @@ The following list describes Traffic Server custom logging 
fields.
 the cached server response headers.
 
 .. note::
-ecssh is the escaped version of this map
+ecssh is the URL-encoded version of this map
 
 .. _caun:
 
@@ -382,7 +382,7 @@ The following list describes Traffic Server custom logging 
fields.
 
 ``cfsc``
 The client finish status code; specifies whether the client request
-to Traffic Server was successfully completed (``FIN``) or
+to |TS| was successfully completed (``FIN``) or
 interrupted (``INTR``).
 
 .. _chi:
@@ -395,33 +395,38 @@ The following list describes Traffic Server custom 
logging fields.
 ``chih``
 The IP address of the client's host machine in hexadecimal.
 
+.. _hii:
+
+``hii``
+This is the incoming (interface) IP address for |TS|, in
+otherwords this is the IP address the client connected to.
+
+.. _hiih:
+
+``hiih``
+The the incoming (interface) IP address in hexadecimal.
+
 .. _chp:
 
 ``chp``
 The port number of the client's host machine.
 
-.. _cps:
-
-``cps``
-Client Protocol Stack, the output would be the conjunction of
-protocol names in the stack spliced with '+', such as "TLS+SPDY".
-
 .. _cqbl:
 
 ``cqbl``
 The client request transfer length; the body length in the client
-request to Traffic Server (in bytes).
+request to |TS| (in bytes).
 
 .. _cqhl:
 
 ``cqhl``
 The client request header length; the header length in the client
-request to Traffic Server.
+request to |TS|.
 
 .. _cqhm:
 
 ``cqhm``
-The HTTP method in the client request to Traffic Server: ``GET``,
+The HTTP method in the client request to |TS|: ``GET``,
 ``POST``, and so on (subset of ``cqtx``).
 
 .. _cqhv:
@@ -429,6 +434,11 @@ The following list describes Traffic Server custom logging 
fields.
 ``cqhv``
 The client request HTTP version.
 
+.. _cqpv:
+
+``cqpv``
+The client request protocol and version.
+
 .. _cqtd:
 
 ``cqtd``
@@ -445,14 +455,13 @@ The following list describes Traffic Server custom 
logging fields.
 .. _cqtq:
 
 ``cqtq``
-The client request timestamp, with millisecond resolution.
+The time of the client request since January 1, 1970 UTC (epoch),

trafficserver git commit: TS-4029: remove unnecessary _memcpy and _strlen

[jpeach]

Repository: trafficserver
Updated Branches:
  refs/heads/master 648e21574 -> 4c31cd28b


TS-4029: remove unnecessary _memcpy and _strlen


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

Branch: refs/heads/master
Commit: 4c31cd28bdf8945951ddc807236d819d5abbd6d8
Parents: 648e215
Author: James Peach 
Authored: Tue Nov 17 12:56:14 2015 -0800
Committer: James Peach 
Committed: Tue Nov 17 12:56:14 2015 -0800

--
 lib/ts/MMH.cc | 13 -
 lib/ts/ink_string++.h | 29 -
 2 files changed, 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4c31cd28/lib/ts/MMH.cc
--
diff --git a/lib/ts/MMH.cc b/lib/ts/MMH.cc
index 007928e..a90e4d5 100644
--- a/lib/ts/MMH.cc
+++ b/lib/ts/MMH.cc
@@ -96,19 +96,6 @@ ink_init_MMH()
 }
 #endif /* TEST */
 
-
-#ifndef __GNUC__
-// these are short < 16 bytes, help by permitting inlining
-static inline void
-_memcpy(void *dest, const void *src, int nbytes)
-{
-  for (int i = 0; i < nbytes; i++)
-((char *)dest)[i] = ((char *)src)[i];
-}
-
-#define memcpy _memcpy
-#endif
-
 int
 ink_code_incr_MMH_init(MMH_CTX *ctx)
 {

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4c31cd28/lib/ts/ink_string++.h
--
diff --git a/lib/ts/ink_string++.h b/lib/ts/ink_string++.h
index 338b13a..ae44e37 100644
--- a/lib/ts/ink_string++.h
+++ b/lib/ts/ink_string++.h
@@ -35,35 +35,6 @@
 #include 
 #include 
 
-//
-//
-//  mem_copy
-//
-//
-
-static inline void
-_memcpy(char *dest, const char *src, int nbytes)
-{
-  for (int i = 0; i < nbytes; i++)
-dest[i] = src[i];
-}
-
-
-//
-//
-//  mem_len
-//
-//
-
-static inline int
-_strlen(const char *src)
-{
-  const char *old_src = src;
-  while (*src)
-src++;
-  return (int)(src - old_src);
-}
-
 /***
  * *
  * Str (string/length list cell)   *

trafficserver git commit: Memory leak in Rule::socksParse(char*) when a token is missing the '=' sign. This closes #340

[briang]

Repository: trafficserver
Updated Branches:
  refs/heads/master 3de7c6fa9 -> 648e21574


Memory leak in Rule::socksParse(char*) when a token is missing the '=' sign. 
This closes #340


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

Branch: refs/heads/master
Commit: 648e215746369c069b9a5fde069dc750e8ee4f5b
Parents: 3de7c6f
Author: Can Selcik 
Authored: Tue Nov 17 09:18:47 2015 -0800
Committer: Brian Geffon 
Committed: Tue Nov 17 09:18:47 2015 -0800

--
 mgmt/api/GenericParser.cc | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/648e2157/mgmt/api/GenericParser.cc
--
diff --git a/mgmt/api/GenericParser.cc b/mgmt/api/GenericParser.cc
index 66d18f4..770b2a6 100644
--- a/mgmt/api/GenericParser.cc
+++ b/mgmt/api/GenericParser.cc
@@ -623,6 +623,7 @@ Rule::socksParse(char *rule)
 // Every token must have a '=' sign
 if (numSubRuleTok < 2) {
   setErrorHint("'=' is expected in space-delimited token");
+  delete m_tokenList;
   return NULL;
 }