from:"zwoop"

git commit: TS-2097 Remove ink_string_find_dotted_extension()

2013-08-05 Thread zwoop

Updated Branches:
  refs/heads/master 17ec6c208 - 54ea3f7be


TS-2097 Remove ink_string_find_dotted_extension()


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

Branch: refs/heads/master
Commit: 54ea3f7be55f5375774bd48dac01eec9feb5fb37
Parents: 17ec6c2
Author: Leif Hedstrom zw...@apache.org
Authored: Mon Aug 5 15:01:09 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Mon Aug 5 15:01:09 2013 -0600

--
 lib/ts/ink_string.cc | 33 -
 lib/ts/ink_string.h  |  1 -
 2 files changed, 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/54ea3f7b/lib/ts/ink_string.cc
--
diff --git a/lib/ts/ink_string.cc b/lib/ts/ink_string.cc
index 4968676..d38f0e8 100644
--- a/lib/ts/ink_string.cc
+++ b/lib/ts/ink_string.cc
@@ -212,39 +212,6 @@ ink_string_append(char *dest, char *src, int n)
 }   /* End ink_string_append */
 
 
-/*---*
-
-  char *ink_string_find_dotted_extension(char *str, char *ext, int max_ext_len)
-
-  This routine takes a string str, copies the period-separated extension to
-  ext (up to max_ext_len - 1 characters) NUL terminates ext, and
-  returns a pointer into the string str where the '.' of the extension
-  begins, or NULL if there is no extension.
-
- *---*/
-
-char *
-ink_string_find_dotted_extension(char *str, char *ext, int max_ext_len)
-{
-  char *p = NULL;
-
-  if (ext) {
-*ext = '\0';
-if (str) {
-  for (p = (str + strlen(str)) - 1; p = str; p--)
-if (*p == '.')
-  break;
-
-  if (p = str)
-return (NULL);
-
-  ink_strlcpy(ext, (p + 1), max_ext_len);
-}
-  }
-  return (p);
-}   /* End ink_string_find_dotted_extension */
-
-
 #if !HAVE_STRLCPY
 size_t
 ink_strlcpy(char *dst, const char *src, size_t siz)

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/54ea3f7b/lib/ts/ink_string.h
--
diff --git a/lib/ts/ink_string.h b/lib/ts/ink_string.h
index 8351fbe..c553a3e 100644
--- a/lib/ts/ink_string.h
+++ b/lib/ts/ink_string.h
@@ -55,7 +55,6 @@ inkcoreapi char *ink_strncat(char *dest, const char *src, int 
n);
 inkcoreapi char *ink_string_concatenate_strings(char *dest, ...);
 inkcoreapi char *ink_string_concatenate_strings_n(char *dest, int n, ...);
 inkcoreapi char *ink_string_append(char *dest, char *src, int n);
-inkcoreapi char *ink_string_find_dotted_extension(char *str, char *ext, int 
max_ext_len);
 
 /*
  * Copy src to string dst of size siz.  At most siz-1 characters

git commit: TS-2100 Initialize the SSL/NPN registration mutex

2013-08-06 Thread zwoop

Updated Branches:
  refs/heads/master 267640b3d - fe62a344a


TS-2100 Initialize the SSL/NPN registration mutex


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

Branch: refs/heads/master
Commit: fe62a344a1962c96ba17dde09d887052a5bd4eac
Parents: 267640b
Author: Leif Hedstrom zw...@apache.org
Authored: Tue Aug 6 02:13:44 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Tue Aug 6 02:13:44 2013 -0600

--
 CHANGES   | 4 +++-
 proxy/http/HttpProxyServerMain.cc | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fe62a344/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 242bff9..4fe41e3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
  -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 3.3.5
-  
+
+  *) [TS-2100] Initialize the SSL/NPN registration mutex.
+
   * [TS-1987, TS-2097]: Remove duplicate and unused string functions
 
   *) [TS-2091] Return an error from RecGetRecordOrderAndId if the stat isn't

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fe62a344/proxy/http/HttpProxyServerMain.cc
--
diff --git a/proxy/http/HttpProxyServerMain.cc 
b/proxy/http/HttpProxyServerMain.cc
index 1ee1d6e..cae18bd 100644
--- a/proxy/http/HttpProxyServerMain.cc
+++ b/proxy/http/HttpProxyServerMain.cc
@@ -40,7 +40,7 @@ HttpAccept *plugin_http_accept = NULL;
 HttpAccept *plugin_http_transparent_accept = 0;
 
 static SLLSSLNextProtocolAccept ssl_plugin_acceptors;
-static ProcessMutex ssl_plugin_mutex;
+static ProcessMutex ssl_plugin_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 bool
 ssl_register_protocol(const char * protocol, Continuation * contp)

[10/12] git commit: add TS-1987, TS-2097 to CHANGES

2013-08-06 Thread zwoop

add TS-1987, TS-2097 to CHANGES


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

Branch: refs/heads/3.3.x
Commit: 267640b3df8ef7010a33fc3748478384d24b06d3
Parents: aae0505
Author: Igor GaliÄ i.ga...@brainsware.org
Authored: Tue Aug 6 00:16:53 2013 +0200
Committer: Igor GaliÄ i.ga...@brainsware.org
Committed: Tue Aug 6 00:16:53 2013 +0200

--
 CHANGES | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/267640b3/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 7d9357a..242bff9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
  -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 3.3.5
   
+  * [TS-1987, TS-2097]: Remove duplicate and unused string functions
 
   *) [TS-2091] Return an error from RecGetRecordOrderAndId if the stat isn't
registered.

[04/12] git commit: TS-1987: rip out ink_string_fast_ functions

2013-08-06 Thread zwoop

TS-1987: rip out ink_string_fast_ functions


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

Branch: refs/heads/3.3.x
Commit: 87fce2a2752bfb586dde90f4fde4938d4f7bc107
Parents: f653a34
Author: Igor GaliÄ i.ga...@brainsware.org
Authored: Mon Aug 5 21:23:52 2013 +0200
Committer: Igor GaliÄ i.ga...@brainsware.org
Committed: Mon Aug 5 21:23:52 2013 +0200

--
 lib/ts/ink_string.h | 198 ---
 1 file changed, 198 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/87fce2a2/lib/ts/ink_string.h
--
diff --git a/lib/ts/ink_string.h b/lib/ts/ink_string.h
index ae71cc3..8703d25 100644
--- a/lib/ts/ink_string.h
+++ b/lib/ts/ink_string.h
@@ -193,204 +193,6 @@ ink_string_concatenate_two_strings(char *dest, char *s1, 
char *s2)
 }   /* End ink_string_concatenate_two_strings */
 
 
-static inline void
-ink_string_fast_strncpy(char *dest, char *src, int src_size, int nbytes)
-{
-  int to_copy = nbytes  src_size ? nbytes : src_size;
-
-  ink_assert(nbytes = 0);
-  ink_assert(src_size = 0);
-
-  if (to_copy = 10) {
-switch (to_copy) {
-case 1:
-  dest[0] = '\0';
-  break;
-case 2:
-  dest[0] = src[0];
-  dest[1] = '\0';
-  break;
-case 3:
-  dest[0] = src[0];
-  dest[1] = src[1];
-  dest[2] = '\0';
-  break;
-case 4:
-  dest[0] = src[0];
-  dest[1] = src[1];
-  dest[2] = src[2];
-  dest[3] = '\0';
-  break;
-case 5:
-  dest[0] = src[0];
-  dest[1] = src[1];
-  dest[2] = src[2];
-  dest[3] = src[3];
-  dest[4] = '\0';
-  break;
-case 6:
-  dest[0] = src[0];
-  dest[1] = src[1];
-  dest[2] = src[2];
-  dest[3] = src[3];
-  dest[4] = src[4];
-  dest[5] = '\0';
-  break;
-case 7:
-  dest[0] = src[0];
-  dest[1] = src[1];
-  dest[2] = src[2];
-  dest[3] = src[3];
-  dest[4] = src[4];
-  dest[5] = src[5];
-  dest[6] = '\0';
-  break;
-case 8:
-  dest[0] = src[0];
-  dest[1] = src[1];
-  dest[2] = src[2];
-  dest[3] = src[3];
-  dest[4] = src[4];
-  dest[5] = src[5];
-  dest[6] = src[6];
-  dest[7] = '\0';
-  break;
-case 9:
-  dest[0] = src[0];
-  dest[1] = src[1];
-  dest[2] = src[2];
-  dest[3] = src[3];
-  dest[4] = src[4];
-  dest[5] = src[5];
-  dest[6] = src[6];
-  dest[7] = src[7];
-  dest[8] = '\0';
-  break;
-case 10:
-  dest[0] = src[0];
-  dest[1] = src[1];
-  dest[2] = src[2];
-  dest[3] = src[3];
-  dest[4] = src[4];
-  dest[5] = src[5];
-  dest[6] = src[6];
-  dest[7] = src[7];
-  dest[8] = src[8];
-  dest[9] = '\0';
-  break;
-default:
-  ink_warning(Error in ink_string_fast_strncpy no copy performed d: %s s: 
%s n: %d\n, dest, src, nbytes);
-  break;
-}
-  } else if (to_copy = 1500) {
-int i;
-for (i = 0; i  (to_copy - 1); i++) {
-  dest[i] = src[i];
-}
-dest[i] = '\0';
-  } else {
-memcpy(dest, src, (to_copy - 1));
-dest[to_copy] = '\0';
-  }
-  return;
-}
-
-static inline int
-ink_string_fast_strncasecmp(const char *s0, const char *s1, int n)
-{
-  int i;
-  for (i = 0; (i  n)  (ParseRules::ink_tolower(s0[i]) == 
ParseRules::ink_tolower(s1[i])); i++);
-  if (i == n)
-return 0;
-  else
-return 1;
-}
-
-static inline int
-ink_string_fast_strcasecmp(const char *s0, const char *s1)
-{
-  const char *s = s0, *p = s1;
-  while (*s  *p  (ParseRules::ink_tolower(*s) == 
ParseRules::ink_tolower(*p))) {
-s++;
-p++;
-  }
-  if (!(*s)  !(*p))
-return 0;
-  else
-return 1;
-}
-
-static inline int
-ink_string_fast_strcmp(const char *s0, const char *s1)
-{
-  const char *s = s0, *p = s1;
-
-  while (*s  *p  *s == *p) {
-s++;
-p++;
-  }
-  if (!(*s)  !(*p))
-return 0;
-  else
-return 1;
-}
-
-static inline char *
-ink_string_fast_strcpy(char *dest, char *src)
-{
-  char *s = src, *d = dest;
-
-  while (*s != '\0')
-*d++ = *s++;
-  *d = '\0';
-  return dest;
-}
-
-static inline int
-ink_string_strlen(const char *str)
-{
-  int i;
-
-  if (str[0] == '\0')
-return (0);
-  else if (str[1] == '\0')
-return (1);
-  else if (str[2] == '\0')
-return (2);
-  else if (str[3] == '\0')
-return (3);
-  else if (str[4] == '\0')
-return (4);
-  else {
-for (i = 5; i  16; i++)
-  if (str[i] == '\0')
-return (i);
-return ((int) (16 + strlen((str[16];
-  }
-}
-
-static inline int

[07/12] git commit: TS-2097 replace ink_string_copy() w/ ink_strlcpy()

2013-08-06 Thread zwoop

TS-2097 replace ink_string_copy() w/ ink_strlcpy()

we already have ink_strlcpy() in our reportoire, and ink_string_copy()
is only used twice. We replace those two occurances.


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

Branch: refs/heads/3.3.x
Commit: 17ec6c208ea219dbe0479c9c44649d0fc89aa3c3
Parents: ac04a76
Author: Igor GaliÄ i.ga...@brainsware.org
Authored: Mon Aug 5 22:35:57 2013 +0200
Committer: Igor GaliÄ i.ga...@brainsware.org
Committed: Mon Aug 5 22:35:57 2013 +0200

--
 lib/ts/ink_string.cc   |  2 +-
 lib/ts/ink_string.h| 29 -
 proxy/logging/LogBuffer.cc |  3 +--
 3 files changed, 2 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/17ec6c20/lib/ts/ink_string.cc
--
diff --git a/lib/ts/ink_string.cc b/lib/ts/ink_string.cc
index 00e941e..4968676 100644
--- a/lib/ts/ink_string.cc
+++ b/lib/ts/ink_string.cc
@@ -238,7 +238,7 @@ ink_string_find_dotted_extension(char *str, char *ext, int 
max_ext_len)
   if (p = str)
 return (NULL);
 
-  ink_string_copy(ext, (p + 1), max_ext_len);
+  ink_strlcpy(ext, (p + 1), max_ext_len);
 }
   }
   return (p);

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/17ec6c20/lib/ts/ink_string.h
--
diff --git a/lib/ts/ink_string.h b/lib/ts/ink_string.h
index 0e88634..8351fbe 100644
--- a/lib/ts/ink_string.h
+++ b/lib/ts/ink_string.h
@@ -95,35 +95,6 @@ void ink_utf8_to_latin1(const char *in, int inlen, char 
*out, int *outlen);
 
  *===*/
 
-/*---*
-
-  char *ink_string_copy(char *dest, char *src, int n)
-
-  This routine is like ink_strncpy, but it stops writing to dest
-  after the first NUL from src is written, even if n bytes are
-  not copied.  A NUL is always written if n  0.  Returns dest.
-
- *---*/
-
-static inline char *
-ink_string_copy(char *dest, char *src, int n)
-{
-  char *s, *d;
-
-  s = src;
-  d = dest;
-
-  while ((n  1)  *s) {
-*d++ = *s++;
---n;
-  }
-
-  if (n  0)
-*d = '\0';
-
-  return (dest);
-}   /* End ink_string_copy */
-
 
 // inline int ptr_len_cmp(const char* p1, int l1, const char* p2, int l2)
 //

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/17ec6c20/proxy/logging/LogBuffer.cc
--
diff --git a/proxy/logging/LogBuffer.cc b/proxy/logging/LogBuffer.cc
index ed75174..18a569e 100644
--- a/proxy/logging/LogBuffer.cc
+++ b/proxy/logging/LogBuffer.cc
@@ -646,8 +646,7 @@ LogBuffer::to_ascii(LogEntryHeader * entry, LogFormatType 
type,
 // text log entries are just strings, so simply move it into the
 // format buffer.
 //
-ink_string_copy(write_to, read_from, buf_len);
-return (int)::strlen(write_to); // OPTIMIZE, should not need strlen
+return ink_strlcpy(write_to, read_from, buf_len);
   }
   //
   // We no longer make the distinction between custom vs pre-defined

[06/12] git commit: TS-2097: remove unsued string functions

2013-08-06 Thread zwoop

TS-2097: remove unsued string functions

first round of removing unsued/useless string functions


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

Branch: refs/heads/3.3.x
Commit: ac04a7615a063370f8959d73eaf5ab204c384d2b
Parents: 9533a4d
Author: Igor GaliÄ i.ga...@brainsware.org
Authored: Mon Aug 5 22:22:34 2013 +0200
Committer: Igor GaliÄ i.ga...@brainsware.org
Committed: Mon Aug 5 22:22:34 2013 +0200

--
 lib/ts/ink_string.h| 68 -
 mgmt/cluster/ClusterCom.cc |  4 +--
 2 files changed, 2 insertions(+), 70 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ac04a761/lib/ts/ink_string.h
--
diff --git a/lib/ts/ink_string.h b/lib/ts/ink_string.h
index 8703d25..0e88634 100644
--- a/lib/ts/ink_string.h
+++ b/lib/ts/ink_string.h
@@ -97,49 +97,6 @@ void ink_utf8_to_latin1(const char *in, int inlen, char 
*out, int *outlen);
 
 /*---*
 
-  char *ink_strchr(char *s, char c)
-
-  A faster version of strchr.
-
- *---*/
-
-static inline char *
-ink_strchr(char *s, char c)
-{
-  while (*s) {
-if (*s == c)
-  return (s);
-else
-  ++s;
-  }
-  return (NULL);
-}   /* End ink_strchr */
-
-
-/*---*
-
-  int ink_string_is_prefix(char *prefix, char *str)
-
-  Returns 1 is prefix is a strict prefix of str, 0 otherwise.
-
- *---*/
-
-static inline int
-ink_string_is_prefix(char *prefix, char *str)
-{
-  while (*prefix  *str  *prefix == *str) {
-++prefix;
-++str;
-  }
-  if (*prefix == '\0')
-return (1);
-  else
-return (0);
-}   /* End ink_string_is_prefix */
-
-
-/*---*
-
   char *ink_string_copy(char *dest, char *src, int n)
 
   This routine is like ink_strncpy, but it stops writing to dest
@@ -168,31 +125,6 @@ ink_string_copy(char *dest, char *src, int n)
 }   /* End ink_string_copy */
 
 
-/*---*
-
-  char *ink_string_concatenate_two_strings(char *dest, char *s1, char *s2)
-
-  This routine concatenates the two strings s1 and s2 into the buffer
-  dest, returning the pointer to dest.
-
- *---*/
-
-static inline char *
-ink_string_concatenate_two_strings(char *dest, char *s1, char *s2)
-{
-  char *d;
-
-  d = dest;
-  while (*s1)
-*d++ = *s1++;
-  while (*s2)
-*d++ = *s2++;
-  *d++ = '\0';
-
-  return (dest);
-}   /* End ink_string_concatenate_two_strings */
-
-
 // inline int ptr_len_cmp(const char* p1, int l1, const char* p2, int l2)
 //
 // strcmp() functionality for two ptr length pairs

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ac04a761/mgmt/cluster/ClusterCom.cc
--
diff --git a/mgmt/cluster/ClusterCom.cc b/mgmt/cluster/ClusterCom.cc
index 2fedee5..4f8344c 100644
--- a/mgmt/cluster/ClusterCom.cc
+++ b/mgmt/cluster/ClusterCom.cc
@@ -896,10 +896,10 @@ ClusterCom::handleMultiCastStatPacket(char *last, 
ClusterPeerInfo * peer)
 case RECD_COUNTER:{
 RecInt tmp_msg_val = -1;
 tmp_id = ink_atoi(line);
-char *v2 = ink_strchr(line, ':'), *v3 = NULL;
+char *v2 = strchr(line, ':'), *v3 = NULL;
 if (v2) {
   tmp_type = (RecDataT) ink_atoi(v2 + 1);
-  v3 = ink_strchr(v2 + 1, ':');
+  v3 = strchr(v2 + 1, ':');
   if (v3)
 tmp_msg_val = ink_atoi64(v3 + 1);
 }

[02/12] git commit: TS-2091: Fix spacing in separate commit

2013-08-06 Thread zwoop

TS-2091: Fix spacing in separate commit


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

Branch: refs/heads/3.3.x
Commit: c6d0fe0e6109fda7f8c8b3791b1b0083fdd09e7b
Parents: ef06341
Author: Phil Sorber sor...@apache.org
Authored: Sat Aug 3 19:34:33 2013 -0600
Committer: Phil Sorber sor...@apache.org
Committed: Sat Aug 3 19:34:33 2013 -0600

--
 lib/records/RecCore.cc | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c6d0fe0e/lib/records/RecCore.cc
--
diff --git a/lib/records/RecCore.cc b/lib/records/RecCore.cc
index 46208ba..4571eef 100644
--- a/lib/records/RecCore.cc
+++ b/lib/records/RecCore.cc
@@ -502,13 +502,13 @@ RecGetRecordOrderAndId(const char *name, int* order, int* 
id, bool lock)
 
   if (ink_hash_table_lookup(g_records_ht, name, (void **) r)) {
 if (r-registered) {
-rec_mutex_acquire((r-lock));
-if (order)
-  *order = r-order;
-if (id)
-  *id = r-rsb_id;
-err = REC_ERR_OKAY;
-rec_mutex_release((r-lock));
+  rec_mutex_acquire((r-lock));
+  if (order)
+*order = r-order;
+  if (id)
+*id = r-rsb_id;
+  err = REC_ERR_OKAY;
+  rec_mutex_release((r-lock));
 }
   }

[03/12] git commit: TS-1501: fix the bug that mistaken the read as write of netvc. thanks zwoop for pointing it out.

2013-08-06 Thread zwoop

TS-1501: fix the bug that mistaken the read as write of netvc.
 thanks zwoop for pointing it out.


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

Branch: refs/heads/3.3.x
Commit: f653a34c8166f4f387e1a5b486a58b88da73a85c
Parents: c6d0fe0
Author: weijin taorui...@taobao.com
Authored: Mon Aug 5 14:04:38 2013 +0800
Committer: weijin taorui...@taobao.com
Committed: Mon Aug 5 14:06:51 2013 +0800

--
 iocore/net/P_UnixNetVConnection.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f653a34c/iocore/net/P_UnixNetVConnection.h
--
diff --git a/iocore/net/P_UnixNetVConnection.h 
b/iocore/net/P_UnixNetVConnection.h
index cc434cd..ac1eca9 100644
--- a/iocore/net/P_UnixNetVConnection.h
+++ b/iocore/net/P_UnixNetVConnection.h
@@ -325,7 +325,7 @@ UnixNetVConnection::set_active_timeout(ink_hrtime timeout)
 active_timeout = thread-schedule_in(this, active_timeout_in);
 } else if (write.enabled) {
   ink_assert(write.vio.mutex-thread_holding == this_ethread()  thread);
-  if (read.vio.mutex-thread_holding == thread)
+  if (write.vio.mutex-thread_holding == thread)
 active_timeout = thread-schedule_in_local(this, active_timeout_in);
   else
 active_timeout = thread-schedule_in(this, active_timeout_in);

[09/12] git commit: TS-2097: remove ink_strtok_r() wrapper

2013-08-06 Thread zwoop

TS-2097: remove ink_strtok_r() wrapper


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

Branch: refs/heads/3.3.x
Commit: aae0505bc827f4accde5973b6cf485b1c157943c
Parents: 54ea3f7
Author: Igor GaliÄ i.ga...@brainsware.org
Authored: Mon Aug 5 23:34:27 2013 +0200
Committer: Igor GaliÄ i.ga...@brainsware.org
Committed: Mon Aug 5 23:34:27 2013 +0200

--
 cop/TrafficCop.cc |  4 ++--
 iocore/dns/DNS.cc |  4 ++--
 lib/records/RecConfigParse.cc |  6 +++---
 lib/ts/ink_string.cc  |  6 --
 lib/ts/ink_string.h   |  3 ---
 mgmt/LocalManager.cc  |  4 ++--
 mgmt/api/CfgContextUtils.cc   |  2 +-
 mgmt/cluster/ClusterCom.cc| 32 
 8 files changed, 26 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/aae0505b/cop/TrafficCop.cc
--
diff --git a/cop/TrafficCop.cc b/cop/TrafficCop.cc
index d1368fa..8cf97ee 100644
--- a/cop/TrafficCop.cc
+++ b/cop/TrafficCop.cc
@@ -708,10 +708,10 @@ spawn_manager()
   }
   options[0] = prog;
   i = 1;
-  tok = ink_strtok_r(manager_options,  , last);
+  tok = strtok_r(manager_options,  , last);
   options[i++] = tok;
   if (tok != NULL) {
-while (i  OPTIONS_MAX  (tok = ink_strtok_r(NULL,  , last))) {
+while (i  OPTIONS_MAX  (tok = strtok_r(NULL,  , last))) {
   options[i++] = tok;
 }
   }

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/aae0505b/iocore/dns/DNS.cc
--
diff --git a/iocore/dns/DNS.cc b/iocore/dns/DNS.cc
index 7dec6a5..a84c8c0 100644
--- a/iocore/dns/DNS.cc
+++ b/iocore/dns/DNS.cc
@@ -247,7 +247,7 @@ DNSProcessor::dns_init()
 int i;
 char *last;
 char *ns_list = ats_strdup(dns_ns_list);
-char *ns = (char *) ink_strtok_r(ns_list,  ,;\t\r, last);
+char *ns = (char *) strtok_r(ns_list,  ,;\t\r, last);
 
 for (i = 0, nserv = 0 ; (i  MAX_NAMED)  ns ; ++i) {
   Debug(dns, Nameserver list - parsing \%s\\n, ns);
@@ -292,7 +292,7 @@ DNSProcessor::dns_init()
 ++nserv;
   }
 
-  ns = (char *) ink_strtok_r(NULL,  ,;\t\r, last);
+  ns = (char *) strtok_r(NULL,  ,;\t\r, last);
 }
 ats_free(ns_list);
   }

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/aae0505b/lib/records/RecConfigParse.cc
--
diff --git a/lib/records/RecConfigParse.cc b/lib/records/RecConfigParse.cc
index f6cd3cc..e4fff37 100644
--- a/lib/records/RecConfigParse.cc
+++ b/lib/records/RecConfigParse.cc
@@ -153,15 +153,15 @@ RecConfigFileParse(const char * path, 
RecConfigEntryCallback handler)
 
 while (isspace(*lt))
   lt++;
-rec_type_str = ink_strtok_r(lt,  \t, ln);
+rec_type_str = strtok_r(lt,  \t, ln);
 
 // check for blank lines and comments
 if ((!rec_type_str) || (rec_type_str  (*rec_type_str == '#'))) {
   goto L_next_line;
 }
 
-name_str = ink_strtok_r(NULL,  \t, ln);
-data_type_str = ink_strtok_r(NULL,  \t, ln);
+name_str = strtok_r(NULL,  \t, ln);
+data_type_str = strtok_r(NULL,  \t, ln);
 
 // extract the string data (a little bit tricker since it can have spaces)
 if (ln) {

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/aae0505b/lib/ts/ink_string.cc
--
diff --git a/lib/ts/ink_string.cc b/lib/ts/ink_string.cc
index d38f0e8..3ce655a 100644
--- a/lib/ts/ink_string.cc
+++ b/lib/ts/ink_string.cc
@@ -270,9 +270,3 @@ ink_strlcat(char *dst, const char *src, size_t siz)
 }
 #endif
 
-char *
-ink_strtok_r(char *s1, const char *s2, char **lasts)
-{
-  return strtok_r(s1, s2, lasts);
-}
-

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/aae0505b/lib/ts/ink_string.h
--
diff --git a/lib/ts/ink_string.h b/lib/ts/ink_string.h
index c553a3e..7048ada 100644
--- a/lib/ts/ink_string.h
+++ b/lib/ts/ink_string.h
@@ -79,9 +79,6 @@ size_t ink_strlcpy(char *dst, const char *str, size_t siz);
 size_t ink_strlcat(char *dst, const char *str, size_t siz);
 #endif
 
-/* 9/3/98 elam: Added this because NT doesn't have strtok_r() */
-char *ink_strtok_r(char *s1, const char *s2, char **lasts);
-
 inkcoreapi int ink_strcasecmp(const char *a, const char *b);
 inkcoreapi int ink_strncasecmp(const char *a, const char *b, unsigned int max);
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/aae0505b/mgmt/LocalManager.cc

[11/12] git commit: TS-2100 Initialize the SSL/NPN registration mutex

2013-08-06 Thread zwoop

TS-2100 Initialize the SSL/NPN registration mutex


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

Branch: refs/heads/3.3.x
Commit: fe62a344a1962c96ba17dde09d887052a5bd4eac
Parents: 267640b
Author: Leif Hedstrom zw...@apache.org
Authored: Tue Aug 6 02:13:44 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Tue Aug 6 02:13:44 2013 -0600

--
 CHANGES   | 4 +++-
 proxy/http/HttpProxyServerMain.cc | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fe62a344/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 242bff9..4fe41e3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
  -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 3.3.5
-  
+
+  *) [TS-2100] Initialize the SSL/NPN registration mutex.
+
   * [TS-1987, TS-2097]: Remove duplicate and unused string functions
 
   *) [TS-2091] Return an error from RecGetRecordOrderAndId if the stat isn't

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fe62a344/proxy/http/HttpProxyServerMain.cc
--
diff --git a/proxy/http/HttpProxyServerMain.cc 
b/proxy/http/HttpProxyServerMain.cc
index 1ee1d6e..cae18bd 100644
--- a/proxy/http/HttpProxyServerMain.cc
+++ b/proxy/http/HttpProxyServerMain.cc
@@ -40,7 +40,7 @@ HttpAccept *plugin_http_accept = NULL;
 HttpAccept *plugin_http_transparent_accept = 0;
 
 static SLLSSLNextProtocolAccept ssl_plugin_acceptors;
-static ProcessMutex ssl_plugin_mutex;
+static ProcessMutex ssl_plugin_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 bool
 ssl_register_protocol(const char * protocol, Continuation * contp)

[08/12] git commit: TS-2097 Remove ink_string_find_dotted_extension()

2013-08-06 Thread zwoop

TS-2097 Remove ink_string_find_dotted_extension()


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

Branch: refs/heads/3.3.x
Commit: 54ea3f7be55f5375774bd48dac01eec9feb5fb37
Parents: 17ec6c2
Author: Leif Hedstrom zw...@apache.org
Authored: Mon Aug 5 15:01:09 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Mon Aug 5 15:01:09 2013 -0600

--
 lib/ts/ink_string.cc | 33 -
 lib/ts/ink_string.h  |  1 -
 2 files changed, 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/54ea3f7b/lib/ts/ink_string.cc
--
diff --git a/lib/ts/ink_string.cc b/lib/ts/ink_string.cc
index 4968676..d38f0e8 100644
--- a/lib/ts/ink_string.cc
+++ b/lib/ts/ink_string.cc
@@ -212,39 +212,6 @@ ink_string_append(char *dest, char *src, int n)
 }   /* End ink_string_append */
 
 
-/*---*
-
-  char *ink_string_find_dotted_extension(char *str, char *ext, int max_ext_len)
-
-  This routine takes a string str, copies the period-separated extension to
-  ext (up to max_ext_len - 1 characters) NUL terminates ext, and
-  returns a pointer into the string str where the '.' of the extension
-  begins, or NULL if there is no extension.
-
- *---*/
-
-char *
-ink_string_find_dotted_extension(char *str, char *ext, int max_ext_len)
-{
-  char *p = NULL;
-
-  if (ext) {
-*ext = '\0';
-if (str) {
-  for (p = (str + strlen(str)) - 1; p = str; p--)
-if (*p == '.')
-  break;
-
-  if (p = str)
-return (NULL);
-
-  ink_strlcpy(ext, (p + 1), max_ext_len);
-}
-  }
-  return (p);
-}   /* End ink_string_find_dotted_extension */
-
-
 #if !HAVE_STRLCPY
 size_t
 ink_strlcpy(char *dst, const char *src, size_t siz)

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/54ea3f7b/lib/ts/ink_string.h
--
diff --git a/lib/ts/ink_string.h b/lib/ts/ink_string.h
index 8351fbe..c553a3e 100644
--- a/lib/ts/ink_string.h
+++ b/lib/ts/ink_string.h
@@ -55,7 +55,6 @@ inkcoreapi char *ink_strncat(char *dest, const char *src, int 
n);
 inkcoreapi char *ink_string_concatenate_strings(char *dest, ...);
 inkcoreapi char *ink_string_concatenate_strings_n(char *dest, int n, ...);
 inkcoreapi char *ink_string_append(char *dest, char *src, int n);
-inkcoreapi char *ink_string_find_dotted_extension(char *str, char *ext, int 
max_ext_len);
 
 /*
  * Copy src to string dst of size siz.  At most siz-1 characters

[12/12] git commit: Merge branch 'master' into 3.3.x

2013-08-06 Thread zwoop

Merge branch 'master' into 3.3.x

* master:
  TS-2100 Initialize the SSL/NPN registration mutex
  add TS-1987, TS-2097 to CHANGES
  TS-2097: remove ink_strtok_r() wrapper
  TS-2097 Remove ink_string_find_dotted_extension()
  TS-2097 replace ink_string_copy() w/ ink_strlcpy()
  TS-2097: remove unsued string functions
  TS-1987: replace ink_string_fast functions
  TS-1987: rip out ink_string_fast_ functions
  TS-1501: fix the bug that mistaken the read as write of netvc.  
thanks zwoop for pointing it out.
  TS-2091: Fix spacing in separate commit
  TS-2091: Return an error from RecGetRecordOrderAndId if the stat isn't 
registered


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

Branch: refs/heads/3.3.x
Commit: e413f12ce13ccfd2742d069501a102673e8975f7
Parents: 1bb12ed fe62a34
Author: Leif Hedstrom zw...@apache.org
Authored: Tue Aug 6 02:48:22 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Tue Aug 6 02:48:22 2013 -0600

--
 CHANGES   |   8 +-
 cop/TrafficCop.cc |   4 +-
 iocore/dns/DNS.cc |   4 +-
 iocore/net/P_UnixNetVConnection.h |   2 +-
 lib/records/RecConfigParse.cc |   6 +-
 lib/records/RecCore.cc|  16 +-
 lib/ts/ink_string.cc  |  39 -
 lib/ts/ink_string.h   | 299 -
 mgmt/LocalManager.cc  |   4 +-
 mgmt/api/CfgContextUtils.cc   |   2 +-
 mgmt/cluster/ClusterCom.cc|  36 ++--
 proxy/http/HttpProxyServerMain.cc |   2 +-
 proxy/http/HttpTransactCache.cc   |   8 +-
 proxy/http/remap/UrlRewrite.cc|  38 ++---
 proxy/logging/LogBuffer.cc|   3 +-
 proxy/logging/LogFilter.cc|   4 +-
 16 files changed, 72 insertions(+), 403 deletions(-)
--

[05/12] git commit: TS-1987: replace ink_string_fast functions

2013-08-06 Thread zwoop

TS-1987: replace ink_string_fast functions

with their standard libc equivalent.


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

Branch: refs/heads/3.3.x
Commit: 9533a4d37f3db280cd6ba47a7906bd21e1b49d3d
Parents: 87fce2a
Author: Igor GaliÄ i.ga...@brainsware.org
Authored: Mon Aug 5 21:40:51 2013 +0200
Committer: Igor GaliÄ i.ga...@brainsware.org
Committed: Mon Aug 5 21:40:51 2013 +0200

--
 proxy/http/HttpTransactCache.cc |  8 
 proxy/http/remap/UrlRewrite.cc  | 38 ++--
 proxy/logging/LogFilter.cc  |  4 ++--
 3 files changed, 25 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9533a4d3/proxy/http/HttpTransactCache.cc
--
diff --git a/proxy/http/HttpTransactCache.cc b/proxy/http/HttpTransactCache.cc
index 6727aa3..b89dfa0 100644
--- a/proxy/http/HttpTransactCache.cc
+++ b/proxy/http/HttpTransactCache.cc
@@ -1186,10 +1186,10 @@ 
HttpTransactCache::CalcVariability(CacheLookupHttpConfig * http_config_params,
   Debug(http_match,   type = '%s', subtype = '%s', type, subtype);
 
   if (http_config_params-cache_enable_default_vary_headers) {
-if (ink_string_fast_strcasecmp(type, text) == 0) {
+if (strcasecmp(type, text) == 0) {
   Debug(http_match,   Using default text vary headers);
   vary_values = http_config_params-cache_vary_default_text;
-} else if (ink_string_fast_strcasecmp(type, image) == 0) {
+} else if (strcasecmp(type, image) == 0) {
   Debug(http_match,   Using default image vary headers);
   vary_values = http_config_params-cache_vary_default_images;
 } else {
@@ -1230,13 +1230,13 @@ 
HttpTransactCache::CalcVariability(CacheLookupHttpConfig * http_config_params,
   // is 1. Actually the 'proxy.config.cache.vary_on_user_agent' is useless 
in such case //
   
///
   if (http_config_params-cache_global_user_agent_header 
-  !ink_string_fast_strcasecmp((char *) field-str, User-Agent))
+  !strcasecmp((char *) field-str, User-Agent))
 continue;
 
   // Disable Vary mismatch checking for Accept-Encoding.  This is only 
safe to
   // set if you are promising to fix any Accept-Encoding/Content-Encoding 
mismatches.
   if (http_config_params-ignore_accept_encoding_mismatch  
-  !ink_string_fast_strcasecmp((char *) field-str, Accept-Encoding))
+  !strcasecmp((char *) field-str, Accept-Encoding))
 continue;
 
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9533a4d3/proxy/http/remap/UrlRewrite.cc
--
diff --git a/proxy/http/remap/UrlRewrite.cc b/proxy/http/remap/UrlRewrite.cc
index dd0a262..9bbf466 100644
--- a/proxy/http/remap/UrlRewrite.cc
+++ b/proxy/http/remap/UrlRewrite.cc
@@ -46,47 +46,47 @@ check_remap_option(char *argv[], int argc, unsigned long 
findmode = 0, int *_ret
 *argptr = NULL;
   if (argv  argc  0) {
 for (int i = 0; i  argc; i++) {
-  if (!ink_string_fast_strcasecmp(argv[i], map_with_referer)) {
+  if (!strcasecmp(argv[i], map_with_referer)) {
 if ((findmode  REMAP_OPTFLG_MAP_WITH_REFERER) != 0)
   idx = i;
 ret_flags |= REMAP_OPTFLG_MAP_WITH_REFERER;
-  } else if (!ink_string_fast_strncasecmp(argv[i], plugin=, 7)) {
+  } else if (!strncasecmp(argv[i], plugin=, 7)) {
 if ((findmode  REMAP_OPTFLG_PLUGIN) != 0)
   idx = i;
 if (argptr)
   *argptr = argv[i][7];
 ret_flags |= REMAP_OPTFLG_PLUGIN;
-  } else if (!ink_string_fast_strncasecmp(argv[i], pparam=, 7)) {
+  } else if (!strncasecmp(argv[i], pparam=, 7)) {
 if ((findmode  REMAP_OPTFLG_PPARAM) != 0)
   idx = i;
 if (argptr)
   *argptr = argv[i][7];
 ret_flags |= REMAP_OPTFLG_PPARAM;
-  } else if (!ink_string_fast_strncasecmp(argv[i], method=, 7)) {
+  } else if (!strncasecmp(argv[i], method=, 7)) {
 if ((findmode  REMAP_OPTFLG_METHOD) != 0)
   idx = i;
 if (argptr)
   *argptr = argv[i][7];
 ret_flags |= REMAP_OPTFLG_METHOD;
-  } else if (!ink_string_fast_strncasecmp(argv[i], src_ip=~, 8)) {
+  } else if (!strncasecmp(argv[i], src_ip=~, 8)) {
 if ((findmode  REMAP_OPTFLG_SRC_IP) != 0)
   idx = i;
 if (argptr)
   *argptr = argv[i][8];
 ret_flags |=

git commit: TS-2102 SPDY plugin tries to setup protocol handler too early.

2013-08-06 Thread zwoop

Updated Branches:
  refs/heads/master a7708dfe1 - c1c963efa


TS-2102 SPDY plugin tries to setup protocol handler too early.


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

Branch: refs/heads/master
Commit: c1c963efad8b7f7773c19c6720845d6c34daddcf
Parents: a7708df
Author: Leif Hedstrom zw...@apache.org
Authored: Tue Aug 6 13:47:11 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Tue Aug 6 13:47:11 2013 -0600

--
 CHANGES   |  2 ++
 plugins/experimental/spdy/spdy.cc | 24 ++--
 2 files changed, 20 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c1c963ef/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 9cdb0f6..c358bb5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
  -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 3.3.5
 
+  *) [TS-2102] SPDY plugin tries to setup protocol handler too early.
+
   *) [TS-1953] remove version checks from plugins that don't use it and
add an example showing off the version API and partial compilation.
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c1c963ef/plugins/experimental/spdy/spdy.cc
--
diff --git a/plugins/experimental/spdy/spdy.cc 
b/plugins/experimental/spdy/spdy.cc
index f7fbed8..1a83e2a 100644
--- a/plugins/experimental/spdy/spdy.cc
+++ b/plugins/experimental/spdy/spdy.cc
@@ -339,6 +339,23 @@ spdy_accept_io(TSCont contp, TSEvent ev, void * edata)
 return TS_EVENT_NONE;
 }
 
+static int
+spdy_setup_protocol(TSCont /* contp ATS_UNUSED */, TSEvent ev, void * /* edata 
ATS_UNUSED */)
+{
+  switch (ev) {
+  case TS_EVENT_LIFECYCLE_PORTS_INITIALIZED:
+TSReleaseAssert(TSNetAcceptNamedProtocol(TSContCreate(spdy_accept_io, 
TSMutexCreate()),
+ TS_NPN_PROTOCOL_SPDY_2) == 
TS_SUCCESS);
+debug_plugin(registered named protocol endpoint for %s, 
TS_NPN_PROTOCOL_SPDY_2);
+break;
+  default:
+TSError([spdy] Protocol registration failed);
+break;
+  }
+
+  return TS_EVENT_NONE;
+}
+
 extern C void
 TSPluginInit(int argc, const char * argv[])
 {
@@ -372,12 +389,7 @@ TSPluginInit(int argc, const char * argv[])
 }
 
 init:
-TSReleaseAssert(
-TSNetAcceptNamedProtocol(TSContCreate(spdy_accept_io, TSMutexCreate()),
-TS_NPN_PROTOCOL_SPDY_2) == TS_SUCCESS);
-
-debug_plugin(registered named protocol endpoint for %s,
-TS_NPN_PROTOCOL_SPDY_2);
+TSLifecycleHookAdd(TS_LIFECYCLE_PORTS_INITIALIZED_HOOK, 
TSContCreate(spdy_setup_protocol, NULL));
 }
 
 /* vim: set sw=4 tw=79 ts=4 et ai : */

[3/4] git commit: TS-2102 SPDY plugin tries to setup protocol handler too early.

2013-08-06 Thread zwoop

TS-2102 SPDY plugin tries to setup protocol handler too early.


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

Branch: refs/heads/3.3.x
Commit: c1c963efad8b7f7773c19c6720845d6c34daddcf
Parents: a7708df
Author: Leif Hedstrom zw...@apache.org
Authored: Tue Aug 6 13:47:11 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Tue Aug 6 13:47:11 2013 -0600

--
 CHANGES   |  2 ++
 plugins/experimental/spdy/spdy.cc | 24 ++--
 2 files changed, 20 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c1c963ef/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 9cdb0f6..c358bb5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
  -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 3.3.5
 
+  *) [TS-2102] SPDY plugin tries to setup protocol handler too early.
+
   *) [TS-1953] remove version checks from plugins that don't use it and
add an example showing off the version API and partial compilation.
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c1c963ef/plugins/experimental/spdy/spdy.cc
--
diff --git a/plugins/experimental/spdy/spdy.cc 
b/plugins/experimental/spdy/spdy.cc
index f7fbed8..1a83e2a 100644
--- a/plugins/experimental/spdy/spdy.cc
+++ b/plugins/experimental/spdy/spdy.cc
@@ -339,6 +339,23 @@ spdy_accept_io(TSCont contp, TSEvent ev, void * edata)
 return TS_EVENT_NONE;
 }
 
+static int
+spdy_setup_protocol(TSCont /* contp ATS_UNUSED */, TSEvent ev, void * /* edata 
ATS_UNUSED */)
+{
+  switch (ev) {
+  case TS_EVENT_LIFECYCLE_PORTS_INITIALIZED:
+TSReleaseAssert(TSNetAcceptNamedProtocol(TSContCreate(spdy_accept_io, 
TSMutexCreate()),
+ TS_NPN_PROTOCOL_SPDY_2) == 
TS_SUCCESS);
+debug_plugin(registered named protocol endpoint for %s, 
TS_NPN_PROTOCOL_SPDY_2);
+break;
+  default:
+TSError([spdy] Protocol registration failed);
+break;
+  }
+
+  return TS_EVENT_NONE;
+}
+
 extern C void
 TSPluginInit(int argc, const char * argv[])
 {
@@ -372,12 +389,7 @@ TSPluginInit(int argc, const char * argv[])
 }
 
 init:
-TSReleaseAssert(
-TSNetAcceptNamedProtocol(TSContCreate(spdy_accept_io, TSMutexCreate()),
-TS_NPN_PROTOCOL_SPDY_2) == TS_SUCCESS);
-
-debug_plugin(registered named protocol endpoint for %s,
-TS_NPN_PROTOCOL_SPDY_2);
+TSLifecycleHookAdd(TS_LIFECYCLE_PORTS_INITIALIZED_HOOK, 
TSContCreate(spdy_setup_protocol, NULL));
 }
 
 /* vim: set sw=4 tw=79 ts=4 et ai : */

[1/4] git commit: fix indentation

2013-08-06 Thread zwoop

Updated Branches:
  refs/heads/3.3.x e413f12ce - 5dec26764


fix indentation


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

Branch: refs/heads/3.3.x
Commit: bacb923495222803986eaa47d92460f9e2ece4fd
Parents: fe62a34
Author: Igor GaliÄ i.ga...@brainsware.org
Authored: Tue Aug 6 13:02:41 2013 +0200
Committer: Igor GaliÄ i.ga...@brainsware.org
Committed: Tue Aug 6 13:02:41 2013 +0200

--
 proxy/ClassH.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bacb9234/proxy/ClassH.txt
--
diff --git a/proxy/ClassH.txt b/proxy/ClassH.txt
index 2471d46..95fbfc7 100644
--- a/proxy/ClassH.txt
+++ b/proxy/ClassH.txt
@@ -41,8 +41,8 @@
/\\
   /  \\
   \\
-DiskIOVConnection   \\
- NetIOVConnection \
+DiskIOVConnection  \\
+NetIOVConnection \
DNSIOVConnection

[2/4] git commit: TS-1953: close this by adding an example CHANGES

2013-08-06 Thread zwoop

TS-1953: close this by adding an example  CHANGES


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

Branch: refs/heads/3.3.x
Commit: a7708dfe1f65f5ff0e2fe273c0165347e544c49c
Parents: bacb923
Author: Igor GaliÄ i.ga...@brainsware.org
Authored: Tue Aug 6 13:12:16 2013 +0200
Committer: Igor GaliÄ i.ga...@brainsware.org
Committed: Tue Aug 6 13:12:16 2013 +0200

--
 CHANGES   |  3 ++
 example/Makefile.am   |  4 ++-
 example/version/version.c | 67 ++
 3 files changed, 73 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a7708dfe/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 4fe41e3..9cdb0f6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
  -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 3.3.5
 
+  *) [TS-1953] remove version checks from plugins that don't use it and
+   add an example showing off the version API and partial compilation.
+
   *) [TS-2100] Initialize the SSL/NPN registration mutex.
 
   * [TS-1987, TS-2097]: Remove duplicate and unused string functions

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a7708dfe/example/Makefile.am
--
diff --git a/example/Makefile.am b/example/Makefile.am
index a5593ff..024edd0 100644
--- a/example/Makefile.am
+++ b/example/Makefile.am
@@ -38,7 +38,8 @@ noinst_LTLIBRARIES = \
   replace-header.la \
   response-header-1.la \
   server-transform.la \
-  thread-1.la
+  thread-1.la \
+  version.la
 
 add_header_la_SOURCES = add-header/add-header.c
 append_transform_la_SOURCES = append-transform/append-transform.c
@@ -60,6 +61,7 @@ response_header_1_la_SOURCES = 
response-header-1/response-header-1.c
 server_transform_la_SOURCES = server-transform/server-transform.c
 thread_1_la_SOURCES = thread-1/thread-1.c
 psi_la_SOURCES = thread-pool/psi.c thread-pool/thread.c
+version_la_SOURCES = version/version.c
 
 # The following examples do not build:
 #

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a7708dfe/example/version/version.c
--
diff --git a/example/version/version.c b/example/version/version.c
new file mode 100644
index 000..5512858
--- /dev/null
+++ b/example/version/version.c
@@ -0,0 +1,67 @@
+/** @file
+
+  an example plugin showing off how to use versioning
+
+  @section license License
+
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  License); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an AS IS BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+ */
+
+#include stdio.h
+
+#include ts/ts.h
+#include ink_defs.h
+
+void
+TSPluginInit(int argc ATS_UNUSED, const char *argv[] ATS_UNUSED)
+{
+  TSPluginRegistrationInfo info;
+
+  // Get the version:
+  const char *ts_version = TSTrafficServerVersionGet();
+
+  if (!ts_version) {
+TSError(Can't get Traffic Server verion.\n);
+return;
+  }
+
+  // Split it in major, minor, patch:
+  int major_ts_version = 0;
+  int minor_ts_version = 0;
+  int patch_ts_version = 0;
+
+  if (sscanf(ts_version, %d.%d.%d, major_ts_version, minor_ts_version, 
patch_ts_version) != 3) {
+TSError(Can't extract verions.\n);
+return;
+  }
+
+  info.plugin_name = version-plugin;
+  info.vendor_name = MyCompany;
+  info.support_email = ts-api-supp...@mycompany.com;
+
+  // partial compilation
+#if (TS_VERSION_NUMBER  300)
+  if (TSPluginRegister(TS_SDK_VERSION_2_0, info) != TS_SUCCESS) {
+#else 
+  if (TSPluginRegister(TS_SDK_VERSION_3_0, info) != TS_SUCCESS) {
+#endif
+TSError(Plugin registration failed. \n);
+  }
+
+  TSDebug(debug-version-plugin, Running in Apache Traffic Server: 
v%d.%d.%d\n, major_ts_version, minor_ts_version, patch_ts_version);
+}
+

[4/4] git commit: Merge branch 'master' into 3.3.x

2013-08-06 Thread zwoop

Merge branch 'master' into 3.3.x

* master:
  TS-2102 SPDY plugin tries to setup protocol handler too early.
  TS-1953: close this by adding an example  CHANGES
  fix indentation


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

Branch: refs/heads/3.3.x
Commit: 5dec26764e98ac48dd0f2f54125920c370e390b7
Parents: e413f12 c1c963e
Author: Leif Hedstrom zw...@apache.org
Authored: Tue Aug 6 13:59:12 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Tue Aug 6 13:59:12 2013 -0600

--
 CHANGES   |  5 +++
 example/Makefile.am   |  4 +-
 example/version/version.c | 67 ++
 plugins/experimental/spdy/spdy.cc | 24 +---
 proxy/ClassH.txt  |  4 +-
 5 files changed, 95 insertions(+), 9 deletions(-)
--

[3/3] git commit: Merge branch 'master' into 3.3.x

2013-08-06 Thread zwoop

Merge branch 'master' into 3.3.x

* master:
  Updated with TS-2099
  TS-2051: Fix SSL crash due to excess READ_COMPLETE events.


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

Branch: refs/heads/3.3.x
Commit: cd64eddc446728defc75de1566c1b2a0b953528d
Parents: 5dec267 c612971
Author: Leif Hedstrom zw...@apache.org
Authored: Tue Aug 6 14:23:28 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Tue Aug 6 14:23:28 2013 -0600

--
 CHANGES |  5 +
 iocore/net/SSLNetVConnection.cc | 18 +++---
 2 files changed, 16 insertions(+), 7 deletions(-)
--

git commit: Updated with TS-2099

2013-08-06 Thread zwoop

Updated Branches:
  refs/heads/master 84486681b - c612971a9


Updated with TS-2099


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

Branch: refs/heads/master
Commit: c612971a939d6fbf387933a60e44f7b3267e1fe6
Parents: 8448668
Author: Leif Hedstrom zw...@apache.org
Authored: Tue Aug 6 14:22:19 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Tue Aug 6 14:23:00 2013 -0600

--
 CHANGES | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c612971a/CHANGES
--
diff --git a/CHANGES b/CHANGES
index aed5f49..70ca933 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,11 @@
  -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 3.3.5
 
+
   *) [TS-2051] Fix SSL crash due to excess READ_COMPLETE events.
 
+  *) [TS-2099] Using wrong member when setting active timeout.
+
   *) [TS-2102] SPDY plugin tries to setup protocol handler too early.
 
   *) [TS-1953] remove version checks from plugins that don't use it and

[1/3] git commit: TS-2051: Fix SSL crash due to excess READ_COMPLETE events.

2013-08-06 Thread zwoop

Updated Branches:
  refs/heads/3.3.x 5dec26764 - cd64eddc4


TS-2051: Fix SSL crash due to excess READ_COMPLETE events.


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

Branch: refs/heads/3.3.x
Commit: 84486681b865f9d3e5e8c79ffadc8f88834a33b2
Parents: c1c963e
Author: Alan M. Carroll a...@network-geographics.com
Authored: Tue Aug 6 15:09:05 2013 -0500
Committer: Alan M. Carroll a...@network-geographics.com
Committed: Tue Aug 6 15:09:05 2013 -0500

--
 CHANGES |  2 ++
 iocore/net/SSLNetVConnection.cc | 18 +++---
 2 files changed, 13 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/84486681/CHANGES
--
diff --git a/CHANGES b/CHANGES
index c358bb5..aed5f49 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
  -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 3.3.5
 
+  *) [TS-2051] Fix SSL crash due to excess READ_COMPLETE events.
+
   *) [TS-2102] SPDY plugin tries to setup protocol handler too early.
 
   *) [TS-1953] remove version checks from plugins that don't use it and

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/84486681/iocore/net/SSLNetVConnection.cc
--
diff --git a/iocore/net/SSLNetVConnection.cc b/iocore/net/SSLNetVConnection.cc
index 3f429eb..86e788e 100644
--- a/iocore/net/SSLNetVConnection.cc
+++ b/iocore/net/SSLNetVConnection.cc
@@ -189,6 +189,7 @@ SSLNetVConnection::net_read_io(NetHandler *nh, EThread 
*lthread)
   int64_t bytes = 0;
   NetState *s = this-read;
   MIOBufferAccessor buf = s-vio.buffer;
+  int64_t ntodo = s-vio.ntodo();
 
   MUTEX_TRY_LOCK_FOR(lock, s-vio.mutex, lthread, s-vio._cont);
   if (!lock) {
@@ -228,21 +229,24 @@ SSLNetVConnection::net_read_io(NetHandler *nh, EThread 
*lthread)
   nh-write_ready_list.remove(this);
   writeReschedule(nh);
 } else if (ret == EVENT_DONE) {
-  read.triggered = 1;
-  if (read.enabled)
-nh-read_ready_list.in_or_enqueue(this);
+  // If this was driven by a zero length read, signal complete when
+  // the handshake is complete. Otherwise set up for continuing read
+  // operations.
+  if (ntodo = 0) {
+readSignalDone(VC_EVENT_READ_COMPLETE, nh);
+  } else {
+read.triggered = 1;
+if (read.enabled)
+  nh-read_ready_list.in_or_enqueue(this);
+  }
 } else
   readReschedule(nh);
 return;
   }
 
   // If there is nothing to do, disable connection
-  int64_t ntodo = s-vio.ntodo();
   if (ntodo = 0) {
 read_disable(nh, this);
-// Don't return early even if there's nothing. We still need
-// to propagate events for zero-length reads.
-readSignalDone(VC_EVENT_READ_COMPLETE, nh);
 return;
   }

Git Push Summary

2013-08-07 Thread zwoop

Updated Tags:  refs/tags/3.3.5 [created] db9d501b7

Git Push Summary

2013-08-07 Thread zwoop

Updated Branches:
  refs/heads/3.4.x [created] c612971a9

git commit: Bumped to v3.5.0

2013-08-07 Thread zwoop

Updated Branches:
  refs/heads/master c612971a9 - 233cf63bb


Bumped to v3.5.0


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

Branch: refs/heads/master
Commit: 233cf63bb086f1fe9913d8297f46e90749ea0c5b
Parents: c612971
Author: Leif Hedstrom zw...@apache.org
Authored: Wed Aug 7 12:06:05 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Wed Aug 7 12:06:05 2013 -0600

--
 CHANGES  | 4 +++-
 configure.ac | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/233cf63b/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 70ca933..0b74ef7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
  -*- coding: utf-8 -*-
-Changes with Apache Traffic Server 3.3.5
+Changes with Apache Traffic Server 3.5.0
+
 
+Changes with Apache Traffic Server 3.3.5
 
   *) [TS-2051] Fix SSL crash due to excess READ_COMPLETE events.
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/233cf63b/configure.ac
--
diff --git a/configure.ac b/configure.ac
index 2879655..c74ff98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,8 +32,8 @@
 # Version number is calculated as MAJOR * 100 + MINOR * 1000 + MICRO
 # Version string is in the form of MAJOR.MINOR.MICRO[sufix]
 #
-m4_define([TS_VERSION_S],[3.3.5-dev])
-m4_define([TS_VERSION_N],[3003005])
+m4_define([TS_VERSION_S],[3.5.0-dev])
+m4_define([TS_VERSION_N],[3005000])
 
 AC_INIT([Apache Traffic Server], TS_VERSION_S(), 
[d...@trafficserver.apache.org], 
[trafficserver],[http://trafficserver.apache.org])
 AC_PREREQ([2.59])

Git Push Summary

2013-08-07 Thread zwoop

Updated Branches:
  refs/heads/issues/TS-1728 [deleted] e8658bf90

Git Push Summary

2013-08-07 Thread zwoop

Updated Branches:
  refs/heads/devrel/3.3.0 [deleted] 24aad8fb8

git commit: Update version to 3.4.0

2013-08-07 Thread zwoop

Updated Branches:
  refs/heads/3.4.x c612971a9 - 2ce0a048d


Update version to 3.4.0


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

Branch: refs/heads/3.4.x
Commit: 2ce0a048de5c790a68010255e172ebc028873ce5
Parents: c612971
Author: Leif Hedstrom zw...@apache.org
Authored: Wed Aug 7 12:21:36 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Wed Aug 7 12:21:36 2013 -0600

--
 CHANGES  | 1 -
 configure.ac | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2ce0a048/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 70ca933..5a342e5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,6 @@
  -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 3.3.5
 
-
   *) [TS-2051] Fix SSL crash due to excess READ_COMPLETE events.
 
   *) [TS-2099] Using wrong member when setting active timeout.

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2ce0a048/configure.ac
--
diff --git a/configure.ac b/configure.ac
index 2879655..516c16c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,8 +32,8 @@
 # Version number is calculated as MAJOR * 100 + MINOR * 1000 + MICRO
 # Version string is in the form of MAJOR.MINOR.MICRO[sufix]
 #
-m4_define([TS_VERSION_S],[3.3.5-dev])
-m4_define([TS_VERSION_N],[3003005])
+m4_define([TS_VERSION_S],[3.4.0])
+m4_define([TS_VERSION_N],[3004000])
 
 AC_INIT([Apache Traffic Server], TS_VERSION_S(), 
[d...@trafficserver.apache.org], 
[trafficserver],[http://trafficserver.apache.org])
 AC_PREREQ([2.59])

git commit: Fixed a few very minor RAT warnings, non-issues just warnings

2013-08-07 Thread zwoop

Updated Branches:
  refs/heads/master 233cf63bb - 695c2ab2d


Fixed a few very minor RAT warnings, non-issues just warnings


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

Branch: refs/heads/master
Commit: 695c2ab2d7cf7ba2dbeb8b43b1bb73c1d80d7542
Parents: 233cf63
Author: Leif Hedstrom zw...@apache.org
Authored: Wed Aug 7 12:32:12 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Wed Aug 7 12:32:12 2013 -0600

--
 ci/rat-excludes.txt|  9 -
 doc/conf.py| 16 
 .../lighttpd_mod_generator/ats_lighttpd_benchmark  | 17 +
 tools/lighttpd_mod_generator/conf/lighttpd.conf| 17 +
 tools/lighttpd_mod_generator/conf/lighttpd_1.conf  | 17 +
 tools/lighttpd_mod_generator/conf/lighttpd_10.conf | 17 +
 tools/lighttpd_mod_generator/conf/lighttpd_12.conf | 17 +
 tools/lighttpd_mod_generator/conf/lighttpd_14.conf | 17 +
 tools/lighttpd_mod_generator/conf/lighttpd_16.conf | 17 +
 tools/lighttpd_mod_generator/conf/lighttpd_18.conf | 17 +
 tools/lighttpd_mod_generator/conf/lighttpd_2.conf  | 17 +
 tools/lighttpd_mod_generator/conf/lighttpd_21.conf | 17 +
 tools/lighttpd_mod_generator/conf/lighttpd_23.conf | 17 +
 tools/lighttpd_mod_generator/conf/lighttpd_4.conf  | 17 +
 tools/lighttpd_mod_generator/conf/lighttpd_6.conf  | 17 +
 tools/lighttpd_mod_generator/conf/lighttpd_8.conf  | 17 +
 16 files changed, 262 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/695c2ab2/ci/rat-excludes.txt
--
diff --git a/ci/rat-excludes.txt b/ci/rat-excludes.txt
index 3d91839..2e59588 100644
--- a/ci/rat-excludes.txt
+++ b/ci/rat-excludes.txt
@@ -41,6 +41,9 @@ proxy/cache_test.config
 proxy/congest/FeatureSpec.txt
 proxy/http/stats.memo
 proxy/issues.txt
+proxy/test_xml_parser
+proxy/tests/logstats.json
+proxy/tests/logstats.summary
 mgmt/cli/cli_detailed_command_list.txt
 mgmt/cli/cli_feature_spec.txt
 example/README.internal
@@ -53,6 +56,7 @@ doc/docbuild/
 doc/dot/
 doc/Doxyfile
 doc/Doxyfile.in
+doc/static/images/press/trafficserver.svg
 lib/tsconfig/test-tsconfig
 lib/tsconfig/TsConfigGrammar.hpp
 lib/ts/ParseRulesCType
@@ -89,7 +93,7 @@ lib/ts/ink_rand.cc
 lib/tsconfig/BisonHeaderToC++.sed
 README-EC2
 REVIEWERS
-lib/perl/AdminClient/MANIFEST
+lib/perl/MANIFEST
 lib/perl/Makefile-pl
 lib/perl/blib/
 lib/perl/pm_to_blib
@@ -107,6 +111,8 @@ lib/tsconfig/test-1.tsconfig
 rc/solaris.txt
 rc/trafficserver.service
 tools/http_load/
+tools/tstop/tstop
+tools/jtest/jtest
 plugins/experimental/stale_while_revalidate/stale_while_revalidate.conf
 plugins/experimental/tcp_info/tcp_info.config
 plugins/experimental/esi/docnode_test
@@ -114,6 +120,7 @@ plugins/experimental/esi/parser_test
 plugins/experimental/esi/processor_test
 plugins/experimental/esi/utils_test
 plugins/experimental/esi/vars_test
+plugins/experimental/esi/README.combo
 iocore/aio/diags.log
 iocore/aio/test_AIO
 iocore/aio/test_AIO.sample

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/695c2ab2/doc/conf.py
--
diff --git a/doc/conf.py b/doc/conf.py
index 9e6e6d3..7cb2f0e 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -3,6 +3,22 @@
 # Apache Traffic Server documentation build configuration file, created by
 # sphinx-quickstart on Mon Mar  4 06:23:15 2013.
 #
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# License); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an AS IS BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # This file is execfile()d with the current directory set to its containing 
dir.
 #
 # Note that not all possible configuration values are present in this

git commit: TS-2111 Reduce Boost requirement to v1.33 or later

2013-08-08 Thread zwoop

Updated Branches:
  refs/heads/master 1ddfc042f - eaa7600b7


TS-2111 Reduce Boost requirement to v1.33 or later


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

Branch: refs/heads/master
Commit: eaa7600b790031e6297302d107bc56b6b90ec398
Parents: 1ddfc04
Author: Leif Hedstrom zw...@apache.org
Authored: Thu Aug 8 11:23:28 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Thu Aug 8 11:24:51 2013 -0600

--
 CHANGES  | 7 +++
 configure.ac | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/eaa7600b/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 7065312..f789c60 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,12 +2,19 @@
 Changes with Apache Traffic Server 3.5.0
 
 
+  *) [TS-2111] configure check in boost falsely requires 1.50. Reducing it to
+   v1.33, which is what RHEL5 ships with.
+
   *) [TS-1823] remap.config line continuation support
 Author: Jim Riggs j...@riggs.me
 
   *) [TS-1597] Document remap.config filters
 Author: Jim Riggs j...@riggs.me
 
+  *) [TS-2111] configure check in boost falsely requires 1.50. Reducing it to
+   v1.33, which is what RHEL5 ships with.
+
+
 Changes with Apache Traffic Server 3.3.5
 
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/eaa7600b/configure.ac
--
diff --git a/configure.ac b/configure.ac
index c74ff98..2033fbc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1049,7 +1049,7 @@ AX_LIB_CURL([7.19], [
 
 #
 # The header_rewrite module depends on boost.
-AX_BOOST_BASE([1.50],
+AX_BOOST_BASE([1.33],
   [ AM_CONDITIONAL([BUILD_HAVE_BOOST], [true]) ],
   [ AM_CONDITIONAL([BUILD_HAVE_BOOST], [false]) ]
 )

git commit: Updated with recent changes.

2013-08-09 Thread zwoop

Updated Branches:
  refs/heads/master 2af1cb274 - 6e5374f5a


Updated with recent changes.


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

Branch: refs/heads/master
Commit: 6e5374f5a2c859e20fde06f9f7a77a5c8aa6788b
Parents: 2af1cb2
Author: Leif Hedstrom zw...@apache.org
Authored: Fri Aug 9 08:46:45 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Fri Aug 9 08:46:45 2013 -0600

--
 CHANGES | 14 +++---
 1 file changed, 11 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6e5374f5/CHANGES
--
diff --git a/CHANGES b/CHANGES
index f789c60..cb686e6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,14 +2,22 @@
 Changes with Apache Traffic Server 3.5.0
 
 
+  *) [TS-2122] Enlarge the 64KB limitation of log buffer size.
+
+  *) [TS-2061] LogFile::write_ascii_logbuffer3() can silently drop log
+   entries.
+
+  *) [TS-2123] Remove useless max_entries_per_buffer option.
+
+  *) [TS-2112] make libloader build by default.
+
   *) [TS-2111] configure check in boost falsely requires 1.50. Reducing it to
v1.33, which is what RHEL5 ships with.
 
-  *) [TS-1823] remap.config line continuation support
+  *) [TS-1823] remap.config line continuation support.
 Author: Jim Riggs j...@riggs.me
 
-  *) [TS-1597] Document remap.config filters
-Author: Jim Riggs j...@riggs.me
+  *) [TS-1597] Document remap.config filters. Author: Jim Riggs 
j...@riggs.me.
 
   *) [TS-2111] configure check in boost falsely requires 1.50. Reducing it to
v1.33, which is what RHEL5 ships with.

git commit: TS-2123 Also remove it from AdminClient.pm.

2013-08-09 Thread zwoop

Updated Branches:
  refs/heads/master 6e5374f5a - 53ae4b950


TS-2123 Also remove it from AdminClient.pm.


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

Branch: refs/heads/master
Commit: 53ae4b9505d68983460bd0d7977ac4f987f95c84
Parents: 6e5374f
Author: Leif Hedstrom zw...@apache.org
Authored: Fri Aug 9 08:48:11 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Fri Aug 9 08:48:11 2013 -0600

--
 lib/perl/lib/Apache/TS/AdminClient.pm | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/53ae4b95/lib/perl/lib/Apache/TS/AdminClient.pm
--
diff --git a/lib/perl/lib/Apache/TS/AdminClient.pm 
b/lib/perl/lib/Apache/TS/AdminClient.pm
index 2e171f4..f6fa827 100644
--- a/lib/perl/lib/Apache/TS/AdminClient.pm
+++ b/lib/perl/lib/Apache/TS/AdminClient.pm
@@ -565,7 +565,6 @@ The Apache Traffic Server Administration Manual will 
explain what these strings
  proxy.config.log.logfile_dir
  proxy.config.log.logfile_perm
  proxy.config.log.logging_enabled
- proxy.config.log.max_entries_per_buffer
  proxy.config.log.max_line_size
  proxy.config.log.max_secs_per_buffer
  proxy.config.log.max_space_mb_for_logs

git commit: Updated for v3.4.x.

2013-08-09 Thread zwoop

Updated Branches:
  refs/heads/3.4.x 7819e9f60 - d5046b6cc


Updated for v3.4.x.


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

Branch: refs/heads/3.4.x
Commit: d5046b6ccfa61adf3a3398463866265eeba8d264
Parents: 7819e9f
Author: Leif Hedstrom zw...@apache.org
Authored: Fri Aug 9 09:51:17 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Fri Aug 9 09:51:17 2013 -0600

--
 STATUS | 15 +++
 1 file changed, 7 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d5046b6c/STATUS
--
diff --git a/STATUS b/STATUS
index 2987880..ee55da1 100644
--- a/STATUS
+++ b/STATUS
@@ -1,22 +1,21 @@
-Traffic Server 3.3 STATUS:  
-*-text-*-
+Traffic Server 3.4 STATUS:  
-*-text-*-
 Last modified at [$Date$]
 
 The current version of this file can be found at:
 
-  * 
http://git-wip-us.apache.org/repos/asf?p=trafficserver.git;a=blob;f=STATUS;hb=master
+  * 
https://git-wip-us.apache.org/repos/asf?p=trafficserver.git;a=blob;f=STATUS;hb=refs/heads/3.4.x
 
 
 Release history:
 [NOTE that x.{odd}.z versions are strictly Alpha/Beta releases,
   while x.{even}.z versions are Stable/GA releases.]
 
-3.3.4   : Released on June 10th, 2013
-3.3.2   : Released on April 18th, 2013
-3.3.1   : Released on March 12th, 2013
-3.3.0   : Released on September 7th, 2012
+3.4.0   : Released on August XYZ, 2013
 
-3.2.4   : Released on January 20, 2013
+3.2.5   : Released on July 17, 2013
+3.2.4   : Released on January 25, 2013
 3.2.0   : Released on June 20, 2012
+
 3.0.5   : Released on June 06, 2012
 3.0.4   : Released on March 21, 2012
 3.0.3   : Released on February 13, 201
@@ -42,7 +41,7 @@ RELEASE SHOWSTOPPERS:
 
 A list of all bugs open for the next development release can be found at
 
-  http://s.apache.org/ts-3.3.4
+  http://s.apache.org/ts-next-dev
 
 
 RELEASE PROCESS

git commit: TS-2129 Check for existence of ExtUtils::MakeMaker

2013-08-10 Thread zwoop

Updated Branches:
  refs/heads/master f34c62b42 - 3f2b11310


TS-2129 Check for existence of ExtUtils::MakeMaker


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

Branch: refs/heads/master
Commit: 3f2b1131069292310edb8c8fe3c5b51b96660f54
Parents: f34c62b
Author: Leif Hedstrom zw...@apache.org
Authored: Sat Aug 10 18:31:40 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Sat Aug 10 18:31:40 2013 -0600

--
 CHANGES  |  2 ++
 build/ax_perl_modules.m4 | 51 +++
 configure.ac |  8 ++-
 lib/Makefile.am  |  6 -
 4 files changed, 65 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3f2b1131/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 0c70a39..e64dabc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@
 Changes with Apache Traffic Server 3.5.0
 
 
+  *) [TS-2129] Check for existence of ExtUtils::MakeMaker.
+
   *) [TS-2128] Don't link libGeoIP.so.1 into binaries
 
   *) [TS-2122] Enlarge the 64KB limitation of log buffer size.

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3f2b1131/build/ax_perl_modules.m4
--
diff --git a/build/ax_perl_modules.m4 b/build/ax_perl_modules.m4
new file mode 100644
index 000..4d881d4
--- /dev/null
+++ b/build/ax_perl_modules.m4
@@ -0,0 +1,51 @@
+# LICENSE
+#
+#   Copyright (c) 2009 Dean Povey po...@wedgetail.com
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+#
+# Use: AX_PROG_PERL_MODULES([modules ...], true, false )
+#
+# This should only be used after the test for the Perl module in configure.ac.
+#
+#serial 7
+
+AU_ALIAS([AC_PROG_PERL_MODULES], [AX_PROG_PERL_MODULES])
+AC_DEFUN([AX_PROG_PERL_MODULES],[dnl
+
+m4_define([ax_perl_modules])
+m4_foreach([ax_perl_module], m4_split(m4_normalize([$1])),
+ [
+  m4_append([ax_perl_modules],
+[']m4_bpatsubst(ax_perl_module,=,[ ])[' ])
+  ])
+
+if test x$PERL != x; then
+  ax_perl_modules_failed=0
+  for ax_perl_module in ax_perl_modules; do
+AC_MSG_CHECKING(for perl module $ax_perl_module)
+
+# Would be nice to log result here, but can't rely on autoconf internals
+$PERL -e use $ax_perl_module; exit  /dev/null 21
+if test $? -ne 0; then
+  AC_MSG_RESULT(no);
+  ax_perl_modules_failed=1
+   else
+  AC_MSG_RESULT(ok);
+fi
+  done
+
+  # Run optional shell commands
+  if test $ax_perl_modules_failed = 0; then
+:
+$2
+  else
+:
+$3
+  fi
+else
+  AC_MSG_WARN(could not find perl)
+fi])

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3f2b1131/configure.ac
--
diff --git a/configure.ac b/configure.ac
index e689872..bfd92d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -716,14 +716,20 @@ AS_IF([test x$enable_wccp = xyes],
   ]
 )
 
+# Check for Perl and Doxygen
 AC_PATH_PROG([DOXYGEN], [doxygen]) # needed for Doxygen
-AC_PATH_PROG([PERL],[perl],[not found])
+AC_PATH_PROG([PERL], [perl],[not found])
 AS_IF([test x$PERL = xnot found],
   [AC_MSG_ERROR([check for perl failed. Have you installed perl?])]
 )
 AC_ARG_VAR([DOXYGEN], [full path of Doxygen executable])
 AC_ARG_VAR([PERL], [full path of Perl executable])
 
+# Check if MakeMaker is available
+AX_PROG_PERL_MODULES([ExtUtils::MakeMaker], AM_CONDITIONAL([BUILD_PERL_LIB], 
[true]),
+AM_CONDITIONAL([BUILD_PERL_LIB], 
[false])
+)
+
 # Check for GNU-style -On and for Solaris Studio style -xOn.
 AC_MSG_CHECKING([checking whether to auto-set compiler optimization flags])
 has_optimizer_flags=`echo $CFLAGS $CXXFLAGS | ${AWK} '$0 !~ /-x?O.?/{print 
no}'`

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3f2b1131/lib/Makefile.am
--
diff --git a/lib/Makefile.am b/lib/Makefile.am
index df3eee5..8be7aa8 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -16,7 +16,11 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-SUBDIRS = ts records perl
+SUBDIRS = ts records
+
+if BUILD_PERL_LIB
+SUBDIRS += perl
+endif
 
 # TsConfig is only built for WCCP until the bugs are worked out.
 if BUILD_WCCP

[3/3] git commit: TS-2111 Reduce Boost requirement to v1.33 or later

2013-08-11 Thread zwoop

TS-2111 Reduce Boost requirement to v1.33 or later


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

Branch: refs/heads/3.4.x
Commit: 56d74dee08a1e829ed867315e62b10e219840324
Parents: e6817d9
Author: Leif Hedstrom zw...@apache.org
Authored: Thu Aug 8 11:23:28 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Sun Aug 11 12:55:47 2013 -0600

--
 CHANGES  | 3 +++
 configure.ac | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/56d74dee/CHANGES
--
diff --git a/CHANGES b/CHANGES
index f3bb775..4255cab 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,9 @@ Changes with Apache Traffic Server 3.4.0
 
   *) [TS-2112] Make libloader compile by default.
 
+  *) [TS-2111] configure check in boost falsely requires 1.50. Reducing it to
+   v1.33, which is what RHEL5 ships with.
+
 
 Changes with Apache Traffic Server 3.3.5
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/56d74dee/configure.ac
--
diff --git a/configure.ac b/configure.ac
index f726ef1..186446e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1055,7 +1055,7 @@ AX_LIB_CURL([7.19], [
 
 #
 # The header_rewrite module depends on boost.
-AX_BOOST_BASE([1.50],
+AX_BOOST_BASE([1.33],
   [ AM_CONDITIONAL([BUILD_HAVE_BOOST], [true]) ],
   [ AM_CONDITIONAL([BUILD_HAVE_BOOST], [false]) ]
 )

[2/3] git commit: TS-2112: make libloader compile by default

2013-08-11 Thread zwoop

TS-2112: make libloader compile by default

libloader has been considered as stable since it's donation, but it
wasn't put into the build by default.

We change this now, and we add a convention for how to add plugins in
the future.


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

Branch: refs/heads/3.4.x
Commit: e6817d9ac3b7c319787048d9078373ba23a67c24
Parents: 35d6c79
Author: Igor GaliÄ i.ga...@brainsware.org
Authored: Thu Aug 8 19:36:35 2013 +0200
Committer: Leif Hedstrom zw...@apache.org
Committed: Sun Aug 11 12:48:50 2013 -0600

--
 CHANGES   |  3 +++
 configure.ac  |  1 +
 plugins/Makefile.am   | 13 -
 plugins/libloader/Makefile.am | 21 +
 4 files changed, 37 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e6817d9a/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 52ce1dc..f3bb775 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,9 @@ Changes with Apache Traffic Server 3.4.0
 
   *) [TS-2129] Check for existence of ExtUtils::MakeMaker.
 
+  *) [TS-2112] Make libloader compile by default.
+
+
 Changes with Apache Traffic Server 3.3.5
 
   *) [TS-2051] Fix SSL crash due to excess READ_COMPLETE events.

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e6817d9a/configure.ac
--
diff --git a/configure.ac b/configure.ac
index 616294c..f726ef1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1859,6 +1859,7 @@ AC_CONFIG_FILES([
   plugins/experimental/tcp_info/Makefile
   plugins/experimental/healthchecks/Makefile
   plugins/gzip/Makefile
+  plugins/libloader/Makefile
   plugins/header_filter/Makefile
   plugins/header_rewrite/Makefile
   plugins/regex_remap/Makefile

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e6817d9a/plugins/Makefile.am
--
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index abfbaac..819af67 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -14,4 +14,15 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-SUBDIRS = conf_remap regex_remap header_filter stats_over_http experimental 
cacheurl header_rewrite gzip
+# Add new plugins in alphabetic order, but keep experimental always at the 
bottom.
+
+SUBDIRS = \
+  cacheurl \
+  conf_remap \
+  gzip \
+  header_filter \
+  header_rewrite \
+  libloader \
+  regex_remap \
+  stats_over_http \
+  experimental

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e6817d9a/plugins/libloader/Makefile.am
--
diff --git a/plugins/libloader/Makefile.am b/plugins/libloader/Makefile.am
new file mode 100644
index 000..1a91a0f
--- /dev/null
+++ b/plugins/libloader/Makefile.am
@@ -0,0 +1,21 @@
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  License); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an AS IS BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+include $(top_srcdir)/build/plugins.mk
+
+pkglib_LTLIBRARIES = libloader.la
+libloader_la_SOURCES = libloader.c
+libloader_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)

[1/3] git commit: TS-2129 Check for existence of ExtUtils::MakeMaker

2013-08-11 Thread zwoop

Updated Branches:
  refs/heads/3.4.x d5046b6cc - 56d74dee0


TS-2129 Check for existence of ExtUtils::MakeMaker


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

Branch: refs/heads/3.4.x
Commit: 35d6c7923ebfb001929bb7adfb183e70f9fb0fbb
Parents: d5046b6
Author: Leif Hedstrom zw...@apache.org
Authored: Sat Aug 10 18:31:40 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Sun Aug 11 12:47:00 2013 -0600

--
 CHANGES  |  5 +
 build/ax_perl_modules.m4 | 51 +++
 configure.ac |  8 ++-
 lib/Makefile.am  |  6 -
 4 files changed, 68 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/35d6c792/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 5a342e5..52ce1dc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,9 @@
  -*- coding: utf-8 -*-
+Changes with Apache Traffic Server 3.4.0
+
+
+  *) [TS-2129] Check for existence of ExtUtils::MakeMaker.
+
 Changes with Apache Traffic Server 3.3.5
 
   *) [TS-2051] Fix SSL crash due to excess READ_COMPLETE events.

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/35d6c792/build/ax_perl_modules.m4
--
diff --git a/build/ax_perl_modules.m4 b/build/ax_perl_modules.m4
new file mode 100644
index 000..4d881d4
--- /dev/null
+++ b/build/ax_perl_modules.m4
@@ -0,0 +1,51 @@
+# LICENSE
+#
+#   Copyright (c) 2009 Dean Povey po...@wedgetail.com
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+#
+# Use: AX_PROG_PERL_MODULES([modules ...], true, false )
+#
+# This should only be used after the test for the Perl module in configure.ac.
+#
+#serial 7
+
+AU_ALIAS([AC_PROG_PERL_MODULES], [AX_PROG_PERL_MODULES])
+AC_DEFUN([AX_PROG_PERL_MODULES],[dnl
+
+m4_define([ax_perl_modules])
+m4_foreach([ax_perl_module], m4_split(m4_normalize([$1])),
+ [
+  m4_append([ax_perl_modules],
+[']m4_bpatsubst(ax_perl_module,=,[ ])[' ])
+  ])
+
+if test x$PERL != x; then
+  ax_perl_modules_failed=0
+  for ax_perl_module in ax_perl_modules; do
+AC_MSG_CHECKING(for perl module $ax_perl_module)
+
+# Would be nice to log result here, but can't rely on autoconf internals
+$PERL -e use $ax_perl_module; exit  /dev/null 21
+if test $? -ne 0; then
+  AC_MSG_RESULT(no);
+  ax_perl_modules_failed=1
+   else
+  AC_MSG_RESULT(ok);
+fi
+  done
+
+  # Run optional shell commands
+  if test $ax_perl_modules_failed = 0; then
+:
+$2
+  else
+:
+$3
+  fi
+else
+  AC_MSG_WARN(could not find perl)
+fi])

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/35d6c792/configure.ac
--
diff --git a/configure.ac b/configure.ac
index 516c16c..616294c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -716,14 +716,20 @@ AS_IF([test x$enable_wccp = xyes],
   ]
 )
 
+# Check for Perl and Doxygen
 AC_PATH_PROG([DOXYGEN], [doxygen]) # needed for Doxygen
-AC_PATH_PROG([PERL],[perl],[not found])
+AC_PATH_PROG([PERL], [perl],[not found])
 AS_IF([test x$PERL = xnot found],
   [AC_MSG_ERROR([check for perl failed. Have you installed perl?])]
 )
 AC_ARG_VAR([DOXYGEN], [full path of Doxygen executable])
 AC_ARG_VAR([PERL], [full path of Perl executable])
 
+# Check if MakeMaker is available
+AX_PROG_PERL_MODULES([ExtUtils::MakeMaker], AM_CONDITIONAL([BUILD_PERL_LIB], 
[true]),
+AM_CONDITIONAL([BUILD_PERL_LIB], 
[false])
+)
+
 # Check for GNU-style -On and for Solaris Studio style -xOn.
 AC_MSG_CHECKING([checking whether to auto-set compiler optimization flags])
 has_optimizer_flags=`echo $CFLAGS $CXXFLAGS | ${AWK} '$0 !~ /-x?O.?/{print 
no}'`

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/35d6c792/lib/Makefile.am
--
diff --git a/lib/Makefile.am b/lib/Makefile.am
index df3eee5..8be7aa8 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -16,7 +16,11 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-SUBDIRS = ts records perl
+SUBDIRS = ts records
+
+if BUILD_PERL_LIB
+SUBDIRS += perl
+endif
 
 # TsConfig is only

[3/3] git commit: TS-2130: pthread_setname_np() detection fails on various platforms

2013-08-11 Thread zwoop

TS-2130: pthread_setname_np() detection fails on various platforms


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

Branch: refs/heads/3.4.x
Commit: b7d9570fc384e8c72d18eb548f7e4afb79d335e9
Parents: 8be7906
Author: James Peach jpe...@apache.org
Authored: Sun Aug 11 13:42:48 2013 -0700
Committer: Leif Hedstrom zw...@apache.org
Committed: Sun Aug 11 16:10:08 2013 -0600

--
 CHANGES  | 2 ++
 configure.ac | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b7d9570f/CHANGES
--
diff --git a/CHANGES b/CHANGES
index e3950c9..19c37b7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@
 Changes with Apache Traffic Server 3.4.0
 
 
+  *) [TS-2130] pthread_setname_np() detection fails on various platforms.
+
   *) [TS-2129] Check for existence of ExtUtils::MakeMaker.
 
   *) [TS-2128] Don't link libGeoIP.so.1 into binaries

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b7d9570f/configure.ac
--
diff --git a/configure.ac b/configure.ac
index 483eb4b..101a6d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1549,7 +1549,7 @@ AC_SUBST(netinet_ip_icmph)
 
 # Darwin pthread_setname_np:
 AC_MSG_CHECKING([for 1-parameter version of pthread_setname_np()])
-AC_COMPILE_IFELSE([
+AC_LINK_IFELSE([
 AC_LANG_PROGRAM([
 #if HAVE_PTHREAD_H
 #include pthread.h
@@ -1569,7 +1569,7 @@ AC_COMPILE_IFELSE([
 
 # Linux pthread_setname_np:
 AC_MSG_CHECKING([for 2-parameter version of pthread_setname_np()])
-AC_COMPILE_IFELSE([
+AC_LINK_IFELSE([
 AC_LANG_PROGRAM([
 #if HAVE_PTHREAD_H
 #include pthread.h
@@ -1589,7 +1589,7 @@ AC_COMPILE_IFELSE([
 
 # BSD pthread_set_name_np:
 AC_MSG_CHECKING([for 2-parameter version of pthread_set_name_np()])
-AC_COMPILE_IFELSE([
+AC_LINK_IFELSE([
 AC_LANG_PROGRAM([
 #if HAVE_PTHREAD_H
 #include pthread.h

[1/3] git commit: TS-2128: Don't link libGeoIP.so.1 into binaries

2013-08-11 Thread zwoop

Updated Branches:
  refs/heads/3.4.x 56d74dee0 - b7d9570fc


TS-2128: Don't link libGeoIP.so.1 into binaries

AC_SEARCH_LIBS always updates $LIBS, but AC_CHECK_LIB doesn't search
properly. So we have to introduce a wrapper around AC_SEARCH_LIBS
that preserves $LIBS so that we can properly test for libraries
without linking them into everything.

Apply the new TS_SEARCH_LIBRARY macro to the geoip_acl plugin so
that libGeoIP is not linked into every binary.


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

Branch: refs/heads/3.4.x
Commit: 6004e206df2e034db984928bb52259def6b9ac76
Parents: 56d74de
Author: James Peach jpe...@apache.org
Authored: Sat Aug 10 15:51:19 2013 -0700
Committer: Leif Hedstrom zw...@apache.org
Committed: Sun Aug 11 14:18:15 2013 -0600

--
 CHANGES |  2 ++
 build/common.m4 | 25 +++-
 configure.ac| 14 ++---
 lib/ts/ink_config.h.in  |  1 -
 plugins/experimental/geoip_acl/Makefile.am  |  1 +
 plugins/experimental/geoip_acl/acl.cc   |  8 
 plugins/experimental/geoip_acl/acl.h|  4 ++--
 plugins/experimental/geoip_acl/geoip_acl.cc |  2 --
 8 files changed, 35 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6004e206/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 4255cab..e3950c9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,8 @@ Changes with Apache Traffic Server 3.4.0
 
   *) [TS-2129] Check for existence of ExtUtils::MakeMaker.
 
+  *) [TS-2128] Don't link libGeoIP.so.1 into binaries
+
   *) [TS-2112] Make libloader compile by default.
 
   *) [TS-2111] configure check in boost falsely requires 1.50. Reducing it to

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6004e206/build/common.m4
--
diff --git a/build/common.m4 b/build/common.m4
index bf01eed..5e58945 100644
--- a/build/common.m4
+++ b/build/common.m4
@@ -513,7 +513,7 @@ done
 
 ])dnl
 
-dnl TS_FLAG_HEADERS(HEADER-FILE ... )
+dnl TS_FLAG_HEADERS(header-file, [action-if-found], [action-if-not-found], 
[includes])
 dnl
 AC_DEFUN([TS_FLAG_HEADERS], [
 AC_CHECK_HEADERS([$1], [$2], [$3], [$4])
@@ -560,3 +560,26 @@ AC_DEFUN([TS_ARG_ENABLE_VAR],[
   )
 ])
 
+dnl
+dnl TS_SEARCH_LIBRARY(function, search-libs, [action-if-found], 
[action-if-not-found])
+dnl This macro works like AC_SEARCH_LIBS, except that $LIBS is not modified. 
If the library
+dnl is found, it is cached in the ts_cv_lib_${function} variable.
+dnl
+AC_DEFUN([TS_SEARCH_LIBRARY], [
+  __saved_LIBS=$LIBS
+
+  AC_SEARCH_LIBS($1, $2, [
+dnl action-if-found
+case $ac_cv_search_$1 in
+none required|no) ts_cv_search_$1= ;;
+*) ts_cv_search_$1=$ac_cv_search_$1 ;;
+esac
+m4_ifval($3, [$3], [true])
+  ], [
+dnl action-if-not-found
+m4_ifval($4, [$4], [true])
+  ])
+
+  LIBS=$__saved_LIBS
+  unset __saved_LIBS
+])

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6004e206/configure.ac
--
diff --git a/configure.ac b/configure.ac
index 186446e..483eb4b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1314,16 +1314,14 @@ AC_SUBST(use_hwloc)
 # GeoIP as a helper plugin, which other plugins can then use. Such a plugin 
could
 # then manage which libraries to use via explicit dlopen()'s.
 #
-use_maxmind_geoip=0
-AC_SEARCH_LIBS([GeoIP_id_by_code], [GeoIP], [use_maxmind_geoip=1], 
[use_maxmind_geoip=0])
-AS_IF([test 1 -eq $use_maxmind_geoip], [
-  TS_FLAG_HEADERS([GeoIP.h], [], [
-AC_MSG_ERROR([Can not locate GeoIP.h, perhaps install GeoIP-devel 
package?])
-  ])
+enable_maxmind_geoip=no
+TS_SEARCH_LIBRARY([GeoIP_id_by_code], [GeoIP], [
+  GEOIP_LIBS=$ts_cv_search_GeoIP_id_by_code
+  TS_FLAG_HEADERS([GeoIP.h], [ enable_maxmind_geoip=yes ])
 ])
 
-AC_SUBST(use_maxmind_geoip)
-AM_CONDITIONAL([BUILD_GEOIP_PLUGIN], [ test 0 -ne $use_maxmind_geoip ])
+AC_SUBST(GEOIP_LIBS)
+AM_CONDITIONAL([BUILD_GEOIP_PLUGIN], [ test x${enable_maxmind_geoip} = 
xyes ])
 
 # Right now, the healthcheck plugins requires inotify_init (and friends)
 AM_CONDITIONAL([BUILD_HEALTHCHECK_PLUGIN], [ test $ac_cv_func_inotify_init = 
yes ])

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6004e206/lib/ts/ink_config.h.in
--
diff --git a/lib/ts/ink_config.h.in b/lib/ts/ink_config.h.in
index 784702d..9dfb46a 100644
---

[2/3] git commit: TS-2128: Fix TS_SEARCH_LIBRARY for RHEL5

2013-08-11 Thread zwoop

TS-2128: Fix TS_SEARCH_LIBRARY for RHEL5

Looks like m4_ifval isn't present in older versions of m4, however
m4_default is probably a better choice anyway.


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

Branch: refs/heads/3.4.x
Commit: 8be7906f49140dae3d2ef35780801bf903237f69
Parents: 6004e20
Author: James Peach jpe...@apache.org
Authored: Sun Aug 11 11:46:26 2013 -0700
Committer: Leif Hedstrom zw...@apache.org
Committed: Sun Aug 11 16:06:34 2013 -0600

--
 build/common.m4 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8be7906f/build/common.m4
--
diff --git a/build/common.m4 b/build/common.m4
index 5e58945..5390288 100644
--- a/build/common.m4
+++ b/build/common.m4
@@ -574,10 +574,10 @@ AC_DEFUN([TS_SEARCH_LIBRARY], [
 none required|no) ts_cv_search_$1= ;;
 *) ts_cv_search_$1=$ac_cv_search_$1 ;;
 esac
-m4_ifval($3, [$3], [true])
+m4_default([$3], [true])
   ], [
 dnl action-if-not-found
-m4_ifval($4, [$4], [true])
+m4_default([$4], [true])
   ])
 
   LIBS=$__saved_LIBS

svn commit: r2734 - /release/trafficserver/

2013-08-14 Thread zwoop

Author: zwoop
Date: Wed Aug 14 14:44:47 2013
New Revision: 2734

Log:
Pushed 3.3.5, last dev version before next major version

Added:
release/trafficserver/trafficserver-3.3.5-dev.tar.bz2   (with props)
release/trafficserver/trafficserver-3.3.5-dev.tar.bz2.asc   (with props)
release/trafficserver/trafficserver-3.3.5-dev.tar.bz2.md5
release/trafficserver/trafficserver-3.3.5-dev.tar.bz2.sha1
Removed:
release/trafficserver/trafficserver-3.3.4-dev.tar.bz2
release/trafficserver/trafficserver-3.3.4-dev.tar.bz2.asc
release/trafficserver/trafficserver-3.3.4-dev.tar.bz2.md5
release/trafficserver/trafficserver-3.3.4-dev.tar.bz2.sha1

Added: release/trafficserver/trafficserver-3.3.5-dev.tar.bz2
==
Binary file - no diff available.

Propchange: release/trafficserver/trafficserver-3.3.5-dev.tar.bz2
--
svn:mime-type = application/x-bzip2

Added: release/trafficserver/trafficserver-3.3.5-dev.tar.bz2.asc
==
Binary file - no diff available.

Propchange: release/trafficserver/trafficserver-3.3.5-dev.tar.bz2.asc
--
svn:mime-type = application/pgp-signature

Added: release/trafficserver/trafficserver-3.3.5-dev.tar.bz2.md5
==
--- release/trafficserver/trafficserver-3.3.5-dev.tar.bz2.md5 (added)
+++ release/trafficserver/trafficserver-3.3.5-dev.tar.bz2.md5 Wed Aug 14 
14:44:47 2013
@@ -0,0 +1 @@
+e2ee980906c23ceca292a884b3c37c16 *trafficserver-3.3.5-dev.tar.bz2

Added: release/trafficserver/trafficserver-3.3.5-dev.tar.bz2.sha1
==
--- release/trafficserver/trafficserver-3.3.5-dev.tar.bz2.sha1 (added)
+++ release/trafficserver/trafficserver-3.3.5-dev.tar.bz2.sha1 Wed Aug 14 
14:44:47 2013
@@ -0,0 +1 @@
+3b284572368cddda01ec02ac267cefff3a11b71a *trafficserver-3.3.5-dev.tar.bz2

[1/3] git commit: TS-2131: ${localstatedir} chowned to ATS' user

2013-08-14 Thread zwoop

Updated Branches:
  refs/heads/3.4.x b7d9570fc - eeb41df01


TS-2131: ${localstatedir} chowned to ATS' user

Calling make install sets ${localstatedir} owner and group to ats
user. Needlessly so. This patch fixes it.


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

Branch: refs/heads/3.4.x
Commit: 03cafd317b7025b50e96b298cb77d1fa5350d837
Parents: b7d9570
Author: Igor GaliÄ i.ga...@brainsware.org
Authored: Wed Aug 14 11:47:27 2013 +0200
Committer: Leif Hedstrom zw...@apache.org
Committed: Wed Aug 14 19:45:08 2013 -0600

--
 proxy/Makefile.am | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/03cafd31/proxy/Makefile.am
--
diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index 48f1dd6..852f8cb 100644
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -296,7 +296,8 @@ install-data-local:
$(DESTDIR)$(pkgsysconfdir) 
$(DESTDIR)$(pkgsysconfdir)/internal $(DESTDIR)$(pkgdatadir) \
$(DESTDIR)$(pkgcachedir); \
else \
-$(INSTALL) -d -o $(pkgsysuser) -g $(pkgsysgroup) 
$(DESTDIR)$(pkglocalstatedir) $(DESTDIR)$(pkglogdir) \
+$(INSTALL) -d $(DESTDIR)$(pkglocalstatedir); \
+$(INSTALL) -d -o $(pkgsysuser) -g $(pkgsysgroup) 
$(DESTDIR)$(pkglogdir) \
$(DESTDIR)$(pkgruntimedir) 
$(DESTDIR)$(pkgsysconfdir) \
$(DESTDIR)$(pkgsysconfdir)/internal 
$(DESTDIR)$(pkgdatadir) $(DESTDIR)$(pkgcachedir); \
fi

[3/3] git commit: TS-2132: ${libexecdir} chowned to ATS' user

2013-08-14 Thread zwoop

TS-2132: ${libexecdir} chowned to ATS' user

Calling make install sets ${libexecdir} owner and group
to ats user. Needlessly so. This patch fixes it.


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

Branch: refs/heads/3.4.x
Commit: eeb41df01064631b0576fdfbc17074e841a8ac41
Parents: 8bf6033
Author: Igor GaliÄ i.ga...@brainsware.org
Authored: Wed Aug 14 12:22:53 2013 +0200
Committer: Leif Hedstrom zw...@apache.org
Committed: Wed Aug 14 20:07:09 2013 -0600

--
 proxy/Makefile.am | 11 ---
 1 file changed, 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/eeb41df0/proxy/Makefile.am
--
diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index 852f8cb..7e25e34 100644
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -307,14 +307,3 @@ install-data-hook:
chown -R $(pkgsysuser):$(pkgsysgroup) 
$(DESTDIR)$(pkgsysconfdir) $(DESTDIR)$(pkgdatadir);\
fi
-echo TS_VERSION $(PACKAGE_VERSION)  
$(DESTDIR)$(pkgsysconfdir)/trafficserver-release
-
-install-exec-local:
-   if [ `id -un` != root ]; then \
-   $(INSTALL) -d $(DESTDIR)$(pkglibexecdir); \
-   else \
-   $(INSTALL) -d -o $(pkgsysuser) -g $(pkgsysgroup) 
$(DESTDIR)$(pkglibexecdir); fi
-
-install-exec-hook:
-   if [ `id -un` == root ]; then \
-   chown -R $(pkgsysuser):$(pkgsysgroup) 
$(DESTDIR)$(pkglibexecdir); \
-   fi

[2/3] git commit: add changes for TS-2132, TS-2131

2013-08-14 Thread zwoop

add changes for TS-2132, TS-2131


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

Branch: refs/heads/3.4.x
Commit: 8bf60334bf56e88f0318afab6023f3b866d57e98
Parents: 03cafd3
Author: Igor GaliÄ i.ga...@brainsware.org
Authored: Wed Aug 14 12:27:21 2013 +0200
Committer: Leif Hedstrom zw...@apache.org
Committed: Wed Aug 14 19:46:09 2013 -0600

--
 CHANGES | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8bf60334/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 19c37b7..46f1603 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
  -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 3.4.0
 
+  *) [TS-2132, TS-2131] ${libexecdir} and $(localstatedir} chowned
+   needlessly chowned to to ATS' user.
+   Author: Tomasz Kuzemko tom...@kuzemko.net
 
   *) [TS-2130] pthread_setname_np() detection fails on various platforms.

git commit: TS-2127 Move hostdb.config to var/trafficserver

2013-08-16 Thread zwoop

Updated Branches:
  refs/heads/master cd1f40a5f - dfba93de1


TS-2127 Move hostdb.config to var/trafficserver

This eliminates the entire etc/internal directory, and moves the
hostdb.config to the var/trafficserver (depending on configure option
of course). This means hostdb.config and host.db are now in the same
directory, together with all other state files:

-rw-r--r-- 1 nobody nobody71 Aug 16 09:51 hostdb.config
-rw-r--r-- 1 nobody nobody 268435456 Aug 16 09:52 cache.db
-rw-r--r-- 1 root   root   6 Aug 16 10:47 cop.lock
-rw-r--r-- 1 nobody nobody 6 Aug 16 10:47 manager.lock
srwxr-xr-x 1 nobody nobody 0 Aug 16 10:47 process_server
srwxr-xr-x 1 nobody nobody 0 Aug 16 10:47 mgmtapisocket
srwxr-xr-x 1 nobody nobody 0 Aug 16 10:47 eventapisocket
-rw-r--r-- 1 nobody nobody 6 Aug 16 10:47 server.lock
-rw-r--r-- 1 nobody nobody  1068 Aug 16 10:50 stats.snap
-rw-r--r-- 1 nobody nobody  25935872 Aug 16 10:50 host.db
-rw--- 1 nobody nobody 64208 Aug 16 10:50 records.snap


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

Branch: refs/heads/master
Commit: dfba93de1f02204f8f8d15cff398243d75be2e8c
Parents: cd1f40a
Author: Leif Hedstrom zw...@apache.org
Authored: Sat Aug 10 14:35:14 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Fri Aug 16 10:49:34 2013 -0600

--
 CHANGES | 11 +++
 cop/TrafficCop.cc   |  2 +-
 doc/admin/faqs.en.rst   |  4 ++--
 iocore/hostdb/HostDB.cc |  2 +-
 iocore/hostdb/MultiCache.cc |  8 ++--
 proxy/Main.cc   |  3 +--
 proxy/Makefile.am   |  5 ++---
 7 files changed, 16 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/dfba93de/CHANGES
--
diff --git a/CHANGES b/CHANGES
index c613f00..435b321 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,10 @@
 Changes with Apache Traffic Server 3.5.0
 
 
-  *) TS-2089: introduce configurable collation preproc threads
+  *) [TS-2127] Move hostdb.config to var/trafficserver, together with with the
+   host.db itself.
+
+  *) [TS-2089] Introduce configurable collation preproc threads.
 
   *) [TS-2132, TS-2131] ${libexecdir} and $(localstatedir} chowned
needlessly chowned to to ATS' user.
@@ -12,11 +15,11 @@ Changes with Apache Traffic Server 3.5.0
 
   *) [TS-2130] pthread_setname_np() detection fails on various platforms.
 
-  *)[ TS-2096] improve SSL certificate loading error messages
+  *)[ TS-2096] Improve SSL certificate loading error messages.
 
   *) [TS-2129] Check for existence of ExtUtils::MakeMaker.
 
-  *) [TS-2128] Don't link libGeoIP.so.1 into binaries
+  *) [TS-2128] Don't link libGeoIP.so.1 into binaries.
 
   *) [TS-2122] Enlarge the 64KB limitation of log buffer size.
 
@@ -25,7 +28,7 @@ Changes with Apache Traffic Server 3.5.0
 
   *) [TS-2123] Remove useless max_entries_per_buffer option.
 
-  *) [TS-2112] make libloader build by default.
+  *) [TS-2112] Make libloader build by default.
 
   *) [TS-2111] configure check in boost falsely requires 1.50. Reducing it to
v1.33, which is what RHEL5 ships with.

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/dfba93de/cop/TrafficCop.cc
--
diff --git a/cop/TrafficCop.cc b/cop/TrafficCop.cc
index 8cf97ee..0b03c31 100644
--- a/cop/TrafficCop.cc
+++ b/cop/TrafficCop.cc
@@ -1521,7 +1521,7 @@ check_no_run()
   int err;
 
   cop_log_trace(Entering check_no_run()\n);
-  snprintf(path, sizeof(path), %s/internal/no_cop, config_dir);
+  snprintf(path, sizeof(path), %s/no_cop, runtime_dir);
 
   do {
 err = stat(path, info);

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/dfba93de/doc/admin/faqs.en.rst
--
diff --git a/doc/admin/faqs.en.rst b/doc/admin/faqs.en.rst
index e3e9bbd..28ab7fa 100644
--- a/doc/admin/faqs.en.rst
+++ b/doc/admin/faqs.en.rst
@@ -296,9 +296,9 @@ client machines have no access to the cluster ports.
 The following message appears repeatedly in the system log file:
 
 ::
- traffic_cop[16056]: encountered config/internal/no_cop file...exiting
+ traffic_cop[16056]: encountered var/trafficserver/no_cop file...exiting
 
-The file ``config/internal/no_cop`` acts as an administrative control
+The file ``var/trafficserver/no_cop`` acts as an administrative control
 that instructs the ``traffic_cop`` process to exit immediately without
 starting ``traffic_manager`` or performing any health checks.

git commit: TS-2127 Move hostdb.config to var/trafficserver

2013-08-16 Thread zwoop

Updated Branches:
  refs/heads/3.4.x eeb41df01 - 151326711


TS-2127 Move hostdb.config to var/trafficserver

This eliminates the entire etc/internal directory, and moves the
hostdb.config to the var/trafficserver (depending on configure option
of course). This means hostdb.config and host.db are now in the same
directory, together with all other state files:

-rw-r--r-- 1 nobody nobody71 Aug 16 09:51 hostdb.config
-rw-r--r-- 1 nobody nobody 268435456 Aug 16 09:52 cache.db
-rw-r--r-- 1 root   root   6 Aug 16 10:47 cop.lock
-rw-r--r-- 1 nobody nobody 6 Aug 16 10:47 manager.lock
srwxr-xr-x 1 nobody nobody 0 Aug 16 10:47 process_server
srwxr-xr-x 1 nobody nobody 0 Aug 16 10:47 mgmtapisocket
srwxr-xr-x 1 nobody nobody 0 Aug 16 10:47 eventapisocket
-rw-r--r-- 1 nobody nobody 6 Aug 16 10:47 server.lock
-rw-r--r-- 1 nobody nobody  1068 Aug 16 10:50 stats.snap
-rw-r--r-- 1 nobody nobody  25935872 Aug 16 10:50 host.db
-rw--- 1 nobody nobody 64208 Aug 16 10:50 records.snap


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

Branch: refs/heads/3.4.x
Commit: 1513267119e792123a37b00d6edd93eb47f0979b
Parents: eeb41df
Author: Leif Hedstrom zw...@apache.org
Authored: Sat Aug 10 14:35:14 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Fri Aug 16 10:54:37 2013 -0600

--
 CHANGES | 5 +
 cop/TrafficCop.cc   | 2 +-
 doc/admin/faqs.en.rst   | 4 ++--
 iocore/hostdb/HostDB.cc | 2 +-
 iocore/hostdb/MultiCache.cc | 8 ++--
 proxy/Main.cc   | 3 +--
 proxy/Makefile.am   | 5 ++---
 7 files changed, 14 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/15132671/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 46f1603..3ad4edc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,11 @@
  -*- coding: utf-8 -*-
+
 Changes with Apache Traffic Server 3.4.0
 
+
+  *) [TS-2127] Move hostdb.config to var/trafficserver, together with with the
+   host.db itself.
+
   *) [TS-2132, TS-2131] ${libexecdir} and $(localstatedir} chowned
needlessly chowned to to ATS' user.
Author: Tomasz Kuzemko tom...@kuzemko.net

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/15132671/cop/TrafficCop.cc
--
diff --git a/cop/TrafficCop.cc b/cop/TrafficCop.cc
index 8cf97ee..0b03c31 100644
--- a/cop/TrafficCop.cc
+++ b/cop/TrafficCop.cc
@@ -1521,7 +1521,7 @@ check_no_run()
   int err;
 
   cop_log_trace(Entering check_no_run()\n);
-  snprintf(path, sizeof(path), %s/internal/no_cop, config_dir);
+  snprintf(path, sizeof(path), %s/no_cop, runtime_dir);
 
   do {
 err = stat(path, info);

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/15132671/doc/admin/faqs.en.rst
--
diff --git a/doc/admin/faqs.en.rst b/doc/admin/faqs.en.rst
index e3e9bbd..28ab7fa 100644
--- a/doc/admin/faqs.en.rst
+++ b/doc/admin/faqs.en.rst
@@ -296,9 +296,9 @@ client machines have no access to the cluster ports.
 The following message appears repeatedly in the system log file:
 
 ::
- traffic_cop[16056]: encountered config/internal/no_cop file...exiting
+ traffic_cop[16056]: encountered var/trafficserver/no_cop file...exiting
 
-The file ``config/internal/no_cop`` acts as an administrative control
+The file ``var/trafficserver/no_cop`` acts as an administrative control
 that instructs the ``traffic_cop`` process to exit immediately without
 starting ``traffic_manager`` or performing any health checks. The
 ``no_cop`` file prevents Traffic Server from starting automatically when

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/15132671/iocore/hostdb/HostDB.cc
--
diff --git a/iocore/hostdb/HostDB.cc b/iocore/hostdb/HostDB.cc
index f7cd00a..0b114b4 100644
--- a/iocore/hostdb/HostDB.cc
+++ b/iocore/hostdb/HostDB.cc
@@ -414,7 +414,7 @@ HostDBCache::start(int flags)
 Note(reconfiguring host database);
 
 char p[PATH_NAME_MAX + 1];
-Layout::relative_to(p, PATH_NAME_MAX, system_config_directory, 
internal/hostdb.config);
+Layout::relative_to(p, PATH_NAME_MAX, system_runtime_dir, hostdb.config);
 if (unlink(p)  0)
   Debug(hostdb, unable to unlink %s, p);
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/15132671/iocore/hostdb/MultiCache.cc

svn commit: r1515468 - /trafficserver/site/trunk/content/index.html

2013-08-19 Thread zwoop

Author: zwoop
Date: Mon Aug 19 15:26:24 2013
New Revision: 1515468

URL: http://svn.apache.org/r1515468
Log:
Updated News section with yunkai and 3.3.5

Modified:
trafficserver/site/trunk/content/index.html

Modified: trafficserver/site/trunk/content/index.html
URL: 
http://svn.apache.org/viewvc/trafficserver/site/trunk/content/index.html?rev=1515468r1=1515467r2=1515468view=diff
==
--- trafficserver/site/trunk/content/index.html (original)
+++ trafficserver/site/trunk/content/index.html Mon Aug 19 15:26:24 2013
@@ -253,6 +253,10 @@
 div class=twelvecol
   div id=blurbbox
 ul
+  libAugust 19, 2013:/b The Apache Traffic Server community
+  welcomes our latest committer, Yunkai Zhang. Welcome!/li
+  libAugust 16, 2013:/b Our latest developer release,
+v3.3.5-dev, is now available from the download page./li
   libJuly 31, 2013:/b The Apache Traffic Server community
   is extremely pleased to announce the immediate availability of
   ATS v3.2.5. It can be downloaded from the normal download page,

svn commit: r875338 - in /websites/production/trafficserver: cgi-bin/ content/

2013-08-19 Thread zwoop

Author: zwoop
Date: Mon Aug 19 15:27:04 2013
New Revision: 875338

Log:
Updated with 3.3.5 and News section.

Added:
websites/production/trafficserver/cgi-bin/
  - copied from r875337, websites/staging/trafficserver/trunk/cgi-bin/
websites/production/trafficserver/content/
  - copied from r875337, websites/staging/trafficserver/trunk/content/

svn commit: r1515478 - /trafficserver/site/trunk/content/downloads.en.mdtext

2013-08-19 Thread zwoop

Author: zwoop
Date: Mon Aug 19 15:44:01 2013
New Revision: 1515478

URL: http://svn.apache.org/r1515478
Log:
Fix broken links to Jira release notes

Modified:
trafficserver/site/trunk/content/downloads.en.mdtext

Modified: trafficserver/site/trunk/content/downloads.en.mdtext
URL: 
http://svn.apache.org/viewvc/trafficserver/site/trunk/content/downloads.en.mdtext?rev=1515478r1=1515477r2=1515478view=diff
==
--- trafficserver/site/trunk/content/downloads.en.mdtext (original)
+++ trafficserver/site/trunk/content/downloads.en.mdtext Mon Aug 19 15:44:01 
2013
@@ -310,7 +310,7 @@ The Jira release notes are also [availab
  a 
href=http://archive.apache.org/dist/trafficserver/trafficserver-3.3.2-dev.tar.bz2;
 class=download_tsTraffic Server 3.3.2/a
 
 More details are also in the [CHANGES 
log](https://git-wip-us.apache.org/repos/asf?p=trafficserver.git;a=blob;f=CHANGES;hb=e2aff41f8d68144a0e90b1412c6006b784769af4).
-The Jira release notes are also 
[available](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310963version=12321686).
 
+The Jira release notes are also 
[available](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310963version=12321745).
 
 
 # Archived (developer) Release -- 3.3.1 # {#3.3.1}
 
@@ -322,7 +322,7 @@ The Jira release notes are also [availab
  a 
href=http://archive.apache.org/dist/trafficserver/trafficserver-3.3.1-dev.tar.bz2;
 class=download_tsTraffic Server 3.3.1/a
 
 More details are also in the [CHANGES 
log](https://git-wip-us.apache.org/repos/asf?p=trafficserver.git;a=blob;f=CHANGES;hb=dc3f8ffaa9e44c1ad319f6560f4777276c8d6f0f).
 
-The Jira release notes are also 
[available](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310963version=12321745).
 
+The Jira release notes are also 
[available](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310963version=12321686).
 
 
 
 # Archived (developer) Release -- 3.3.0 # {#3.3.0}

svn commit: r875343 - in /websites/production/trafficserver: cgi-bin/ content/

2013-08-19 Thread zwoop

Author: zwoop
Date: Mon Aug 19 15:44:33 2013
New Revision: 875343

Log:
Fix Jira release notes links.

Added:
websites/production/trafficserver/cgi-bin/
  - copied from r875342, websites/staging/trafficserver/trunk/cgi-bin/
websites/production/trafficserver/content/
  - copied from r875342, websites/staging/trafficserver/trunk/content/

git commit: Updated the precedence list, thanks dcarlin, and added map-all

2013-08-20 Thread zwoop

Updated Branches:
  refs/heads/master 8064935bb - 3aff41097


Updated the precedence list, thanks dcarlin, and added map-all


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

Branch: refs/heads/master
Commit: 3aff41097a1b3c287173dcd096237776aa12849e
Parents: 8064935
Author: Leif Hedstrom zw...@apache.org
Authored: Tue Aug 20 14:28:30 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Tue Aug 20 14:28:30 2013 -0600

--
 doc/reference/configuration/remap.config.en.rst | 16 ++--
 1 file changed, 14 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3aff4109/doc/reference/configuration/remap.config.en.rst
--
diff --git a/doc/reference/configuration/remap.config.en.rst 
b/doc/reference/configuration/remap.config.en.rst
index ad274be..fa2713d 100644
--- a/doc/reference/configuration/remap.config.en.rst
+++ b/doc/reference/configuration/remap.config.en.rst
@@ -106,10 +106,22 @@ Remap rules are not processed top-down, but based on an 
internal
 priority
 
 1. ``map`` and ``reverse_map``
-2. ``redirect`` and ``redirect_temporary``
-3. ``regex_remap``
+2. ``regex_map``
+3. ``redirect`` and ``redirect_temporary``
 4. ``regex_redirect`` and ``regex_redirect_temporary``
 
+
+Match-All
+=
+
+A map rule with a single ``/`` acts as a wildcard, it will match any
+request. This should be use with care, and certainly only once at the
+end of the remap.config file. E.g.
+
+::
+
+map / http://all.example.com
+
 Examples

[1/2] git commit: Added TS-2143

2013-08-20 Thread zwoop

Updated Branches:
  refs/heads/master 335863cc5 - 6b4aff2ce


Added TS-2143


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

Branch: refs/heads/master
Commit: 6b4aff2ce06cef7734e37ecc31704c24d960b2e8
Parents: 821d3fd
Author: Leif Hedstrom zw...@apache.org
Authored: Tue Aug 20 16:14:14 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Tue Aug 20 16:14:18 2013 -0600

--
 CHANGES | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6b4aff2c/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 2dd6d26..9e491c4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@
 Changes with Apache Traffic Server 3.5.0
 
 
+  *) [TS-2143] Remove alarm email address support (and config).
+
   *) [TS-2136] Fix the first proxy.config.http.accept_no_activity_timeout is 
invalid.
 
   *) [TS-2127] Move hostdb.config to var/trafficserver, together with with the

Git Push Summary

2013-08-21 Thread zwoop

Updated Branches:
  refs/heads/4.0.x [created] fbdbd00cb

Git Push Summary

2013-08-21 Thread zwoop

Updated Branches:
  refs/heads/3.4.x [deleted] fbdbd00cb

git commit: Updated to v4.0.0

2013-08-21 Thread zwoop

Updated Branches:
  refs/heads/4.0.x fbdbd00cb - a8002a3b6


Updated to v4.0.0


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

Branch: refs/heads/4.0.x
Commit: a8002a3b66098774c5e7d74793a24039217d8f5f
Parents: fbdbd00
Author: Leif Hedstrom zw...@apache.org
Authored: Wed Aug 21 09:56:12 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Wed Aug 21 09:56:12 2013 -0600

--
 CHANGES | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a8002a3b/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 3700fc4..bca263a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,5 @@
  -*- coding: utf-8 -*-
-
-Changes with Apache Traffic Server 3.4.0
-
+Changes with Apache Traffic Server 4.0.0
 
   *) [TS-2143] Remove alarm email address support (and config).

git commit: Rearranged bugs vs version.

2013-08-21 Thread zwoop

Updated Branches:
  refs/heads/master 10abd558a - d427780ac


Rearranged bugs vs version.


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

Branch: refs/heads/master
Commit: d427780ac97b49da3f424ecb281a0ea7b2a9e6c3
Parents: 10abd55
Author: Leif Hedstrom zw...@apache.org
Authored: Wed Aug 21 10:15:16 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Wed Aug 21 10:15:16 2013 -0600

--
 CHANGES | 43 +--
 1 file changed, 21 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d427780a/CHANGES
--
diff --git a/CHANGES b/CHANGES
index f619a84..fb8b48c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,5 @@
  -*- coding: utf-8 -*-
-Changes with Apache Traffic Server 3.5.0
-
+Changes with Apache Traffic Server 4.1.0
 
   *) TS-2141: Inconsistent euid cause bad mgmtapi/eventapi sockets
 
@@ -8,29 +7,14 @@ Changes with Apache Traffic Server 3.5.0
 
   *) [TS-287] Fix transaction_active_timeout_in does not trigger on the first 
request of a Keep-Alive connection.
 
-  *) [TS-2143] Remove alarm email address support (and config).
-
   *) [TS-2136] Fix the first proxy.config.http.accept_no_activity_timeout is 
invalid.
 
-  *) [TS-2127] Move hostdb.config to var/trafficserver, together with with the
-   host.db itself.
-
   *) [TS-2089] Introduce configurable collation preproc threads.
 
-  *) [TS-2132, TS-2131] ${libexecdir} and $(localstatedir} chowned
-   needlessly chowned to to ATS' user.
-   Author: Tomasz Kuzemko tom...@kuzemko.net
-
   *) [TS-2126] Avoid unnecessary memory copy in LogHost::write()
 
-  *) [TS-2130] pthread_setname_np() detection fails on various platforms.
-
   *)[ TS-2096] Improve SSL certificate loading error messages.
 
-  *) [TS-2129] Check for existence of ExtUtils::MakeMaker.
-
-  *) [TS-2128] Don't link libGeoIP.so.1 into binaries.
-
   *) [TS-2122] Enlarge the 64KB limitation of log buffer size.
 
   *) [TS-2061] LogFile::write_ascii_logbuffer3() can silently drop log
@@ -38,16 +22,31 @@ Changes with Apache Traffic Server 3.5.0
 
   *) [TS-2123] Remove useless max_entries_per_buffer option.
 
-  *) [TS-2112] Make libloader build by default.
-
-  *) [TS-2111] configure check in boost falsely requires 1.50. Reducing it to
-   v1.33, which is what RHEL5 ships with.
-
   *) [TS-1823] remap.config line continuation support.
 Author: Jim Riggs j...@riggs.me
 
   *) [TS-1597] Document remap.config filters. Author: Jim Riggs 
j...@riggs.me.
 
+
+Changes with Apache Traffic Server 4.0.0
+
+  *) [TS-2143] Remove alarm email address support (and config).
+
+  *) [TS-2127] Move hostdb.config to var/trafficserver, together with with the
+   host.db itself.
+
+  *) [TS-2132, TS-2131] ${libexecdir} and $(localstatedir} chowned
+   needlessly chowned to to ATS' user.
+   Author: Tomasz Kuzemko tom...@kuzemko.net
+
+  *) [TS-2130] pthread_setname_np() detection fails on various platforms.
+
+  *) [TS-2129] Check for existence of ExtUtils::MakeMaker.
+
+  *) [TS-2128] Don't link libGeoIP.so.1 into binaries
+
+  *) [TS-2112] Make libloader compile by default.
+
   *) [TS-2111] configure check in boost falsely requires 1.50. Reducing it to
v1.33, which is what RHEL5 ships with.

git commit: Fix indentation and attribution.

2013-08-21 Thread zwoop

Updated Branches:
  refs/heads/master d427780ac - 4ce2cb288


Fix indentation and attribution.


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

Branch: refs/heads/master
Commit: 4ce2cb28814588f2d6cf63d0914225e4615738e2
Parents: d427780
Author: Leif Hedstrom zw...@apache.org
Authored: Wed Aug 21 10:19:29 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Wed Aug 21 10:19:29 2013 -0600

--
 CHANGES | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4ce2cb28/CHANGES
--
diff --git a/CHANGES b/CHANGES
index fb8b48c..c643c81 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,13 +1,15 @@
  -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 4.1.0
 
-  *) TS-2141: Inconsistent euid cause bad mgmtapi/eventapi sockets
+  *) TS-2141: Inconsistent euid cause bad mgmtapi/eventapi sockets.
 
-  *) TS-2137: Use eventfd instread of pthread signal/wait in ATS
+  *) TS-2137: Use eventfd instread of pthread signal/wait in ATS.
 
-  *) [TS-287] Fix transaction_active_timeout_in does not trigger on the first 
request of a Keep-Alive connection.
+  *) [TS-287] Fix transaction_active_timeout_in does not trigger on the first
+   request of a Keep-Alive connection. Author: Li Gang que...@taobao.com.
 
-  *) [TS-2136] Fix the first proxy.config.http.accept_no_activity_timeout is 
invalid.
+  *) [TS-2136] Fix the first proxy.config.http.accept_no_activity_timeout is
+   invalid.
 
   *) [TS-2089] Introduce configurable collation preproc threads.

git commit: Updated with the merges to v4.0.0

2013-08-21 Thread zwoop

Updated Branches:
  refs/heads/master 4ce2cb288 - be93cfbee


Updated with the merges to v4.0.0


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

Branch: refs/heads/master
Commit: be93cfbeefc74f2102d45b00f4fc6137bf79c4e2
Parents: 4ce2cb2
Author: Leif Hedstrom zw...@apache.org
Authored: Wed Aug 21 10:59:44 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Wed Aug 21 10:59:44 2013 -0600

--
 CHANGES | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/be93cfbe/CHANGES
--
diff --git a/CHANGES b/CHANGES
index c643c81..4604c67 100644
--- a/CHANGES
+++ b/CHANGES
@@ -24,11 +24,6 @@ Changes with Apache Traffic Server 4.1.0
 
   *) [TS-2123] Remove useless max_entries_per_buffer option.
 
-  *) [TS-1823] remap.config line continuation support.
-Author: Jim Riggs j...@riggs.me
-
-  *) [TS-1597] Document remap.config filters. Author: Jim Riggs 
j...@riggs.me.
-
 
 Changes with Apache Traffic Server 4.0.0
 
@@ -37,6 +32,12 @@ Changes with Apache Traffic Server 4.0.0
   *) [TS-2127] Move hostdb.config to var/trafficserver, together with with the
host.db itself.
 
+  *) [TS-1823] remap.config line continuation support
+Author: Jim Riggs j...@riggs.me
+
+  *) [TS-1597] Document remap.config filters
+Author: Jim Riggs j...@riggs.me
+
   *) [TS-2132, TS-2131] ${libexecdir} and $(localstatedir} chowned
needlessly chowned to to ATS' user.
Author: Tomasz Kuzemko tom...@kuzemko.net

[1/3] git commit: TS-1823: add line continuation to remap.config

2013-08-21 Thread zwoop

Updated Branches:
  refs/heads/4.0.x a8002a3b6 - c1e0681b2


TS-1823: add line continuation to remap.config

Add line continuation to remap.config using a backslash at the end
of a line as the continuation character.

The handling for continuation was made in tokLine() by adding an
optional third char parameter (`cont') which is the continuation
character. This should make it usable in other contexts outside of
remap.config also, for example other config file parsers.

This implementation is not very intelligent, as it only checks for the
backslash immediately preceding the newline and does not handle any
whitespace. The backslash and newline are converted into spaces, and
the next line is appended.

Example:

.definefilter foo \
  @action=allow \
  @src_ip=127.0.0.1

is read and parsed in UrlRewrite::BuildTable() as:

.definefilter foo @action=allow @src_ip=127.0.0.1


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

Branch: refs/heads/4.0.x
Commit: bd8d18b59a94ca990ea6235158540a661c7fc114
Parents: a8002a3
Author: Jim Riggs j...@riggs.me
Authored: Tue Aug 6 21:06:46 2013 -0500
Committer: Leif Hedstrom zw...@apache.org
Committed: Wed Aug 21 10:50:59 2013 -0600

--
 CHANGES|  6 ++
 lib/ts/MatcherUtils.cc | 19 +--
 lib/ts/MatcherUtils.h  |  2 +-
 proxy/http/remap/UrlRewrite.cc | 10 +-
 4 files changed, 25 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bd8d18b5/CHANGES
--
diff --git a/CHANGES b/CHANGES
index bca263a..35f799e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,12 @@ Changes with Apache Traffic Server 4.0.0
   *) [TS-2127] Move hostdb.config to var/trafficserver, together with with the
host.db itself.
 
+  *) [TS-1823] remap.config line continuation support
+Author: Jim Riggs j...@riggs.me
+
+  *) [TS-1597] Document remap.config filters
+Author: Jim Riggs j...@riggs.me
+
   *) [TS-2132, TS-2131] ${libexecdir} and $(localstatedir} chowned
needlessly chowned to to ATS' user.
Author: Tomasz Kuzemko tom...@kuzemko.net

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bd8d18b5/lib/ts/MatcherUtils.cc
--
diff --git a/lib/ts/MatcherUtils.cc b/lib/ts/MatcherUtils.cc
index 3b07a7b..2254738 100644
--- a/lib/ts/MatcherUtils.cc
+++ b/lib/ts/MatcherUtils.cc
@@ -232,16 +232,17 @@ ExtractIpRange(char *match_str, sockaddr* addr1, 
sockaddr* addr2)
   return NULL;
 }
 
-// char* tokLine(char* buf, char** last)
+// char* tokLine(char* buf, char** last, char cont)
 //
 //  Similar to strtok_r but only tokenizes on '\n'
 //   and will return tokens that are empty strings
 //
 char *
-tokLine(char *buf, char **last)
+tokLine(char *buf, char **last, char cont)
 {
   char *start;
   char *cur;
+  char *prev = NULL;
 
   if (buf != NULL) {
 start = cur = buf;
@@ -252,11 +253,17 @@ tokLine(char *buf, char **last)
 
   while (*cur != '\0') {
 if (*cur == '\n') {
-  *cur = '\0';
-  *last = cur;
-  return start;
+  if (cont != '\0'  prev != NULL  *prev == cont) {
+*prev = ' ';
+*cur = ' ';
+  }
+  else {
+*cur = '\0';
+*last = cur;
+return start;
+  }
 }
-cur++;
+prev = cur++;
   }
 
   // Return the last line even if it does

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bd8d18b5/lib/ts/MatcherUtils.h
--
diff --git a/lib/ts/MatcherUtils.h b/lib/ts/MatcherUtils.h
index de390a8..debaebb 100644
--- a/lib/ts/MatcherUtils.h
+++ b/lib/ts/MatcherUtils.h
@@ -64,7 +64,7 @@ inline char const* ExtractIpRange(
   return ExtractIpRange(match_str, ats_ip_sa_cast(addr1), 
ats_ip_sa_cast(addr2));
 }
 
-char *tokLine(char *buf, char **last);
+char *tokLine(char *buf, char **last, char cont = '\0');
 
 const char *processDurationString(char *str, int *seconds);
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bd8d18b5/proxy/http/remap/UrlRewrite.cc
--
diff --git a/proxy/http/remap/UrlRewrite.cc b/proxy/http/remap/UrlRewrite.cc
index 9bbf466..8b51897 100644
--- a/proxy/http/remap/UrlRewrite.cc
+++ b/proxy/http/remap/UrlRewrite.cc
@@ -,7 +,7 @@ UrlRewrite::BuildTable()
 
   Debug(url_rewrite, [BuildTable] UrlRewrite::BuildTable());
 
-  for (cur_line = tokLine(file_buf, tok_state); cur_line != NULL;) {
+  for (cur_line = tokLine(file_buf,

[2/3] git commit: TS-1597: Document remap.config filters

2013-08-21 Thread zwoop

TS-1597: Document remap.config filters

Add documentation and examples for the
.definefilter, .activatefilter, and .deactivatefilter
directives in remap.config.

These docs are specifically restricted to these particular names
because (1) we should standardize on one variant for each of these
directives to avoid end-user confusion and (2) I personally believe
these variants to be the clearest and most understandable (defflt,
useflt, deuseflt, etc., are confusing or awkward).

The .deletefilter directive is not documented, because I am not sure
when or why it would be used.


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

Branch: refs/heads/4.0.x
Commit: 8975eec745cfe1b8358a6f1c71e9919725990ff5
Parents: bd8d18b
Author: Jim Riggs j...@riggs.me
Authored: Wed Aug 7 21:24:38 2013 -0700
Committer: Leif Hedstrom zw...@apache.org
Committed: Wed Aug 21 10:51:51 2013 -0600

--
 CHANGES |  4 +++
 doc/reference/configuration/remap.config.en.rst | 33 ++
 proxy/config/remap.config.default   | 36 ++--
 3 files changed, 63 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8975eec7/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 35f799e..84bffe3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -28,8 +28,12 @@ Changes with Apache Traffic Server 4.0.0
v1.33, which is what RHEL5 ships with.
 
 
+  *) [TS-1597] Document remap.config filters
+Author: Jim Riggs j...@riggs.me
+
 Changes with Apache Traffic Server 3.3.5
 
+
   *) [TS-2051] Fix SSL crash due to excess READ_COMPLETE events.
 
   *) [TS-2099] Using wrong member when setting active timeout.

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8975eec7/doc/reference/configuration/remap.config.en.rst
--
diff --git a/doc/reference/configuration/remap.config.en.rst 
b/doc/reference/configuration/remap.config.en.rst
index 5122e60..188f32b 100644
--- a/doc/reference/configuration/remap.config.en.rst
+++ b/doc/reference/configuration/remap.config.en.rst
@@ -275,3 +275,36 @@ Examples
 will pass 1 and 2 to plugin1.so and 3 to plugin2.so.
 
 This will pass 1 and 2 to plugin1.so and 3 to plugin2.so
+
+Named Filters
+=
+
+Named filters can be created and applied to blocks of mappings using
+the ``.definefilter``, ``.activatefilter``, and ``.deactivatefilter``
+directives. Named filters must be defined using ``.definefilter`` before
+being used. Once defined, ``.activatefilter`` can used to activate a
+filter for all mappings that follow until deactivated with
+``.deactivatefilter``.
+
+Examples
+
+
+::
+
+.definefilter disable_delete_purge @action=deny @method=delete 
@method=purge
+.definefilter internal_only @action=allow 
@src_ip=192.168.0.1-192.168.0.254 @src_ip=10.0.0.1-10.0.0.254
+
+.activatefilter disable_delete_purge
+
+map http://foo.example.com/ http://bar.example.com/
+
+.activatefilter internal_only
+map http://www.example.com/admin http://internal.example.com/admin
+.deactivatefilter internal_only
+
+map http://www.example.com/ http://internal.example.com/
+
+The filter `disable_delete_purge` will be applied to all of the
+mapping rules. (It is activated before any mappings and is never
+deactivated.) The filter `internal_only` will only be applied to the
+second mapping.

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8975eec7/proxy/config/remap.config.default
--
diff --git a/proxy/config/remap.config.default 
b/proxy/config/remap.config.default
index 91b8cbb..e0cd89a 100644
--- a/proxy/config/remap.config.default
+++ b/proxy/config/remap.config.default
@@ -1,5 +1,5 @@
 #
-#  URL Remapping Config File 
+#  URL Remapping Config File
 #
 # Using remap.config allows you to accomplish two things:
 #
@@ -13,11 +13,11 @@
 #
 # Be aware, doing so makes the proxy a generic, open-relay!
 #
-#  The format is: 
+#  The format is:
 #  map_type client-URL origin-server-URL tag_value filtering
 #
 # Where client-URL and origin-server-URL are both of the format
-#scheme://host:port/path_prefix 
+#scheme://host:port/path_prefix
 #
 #  The tag_value directive is optional and can be different for different
 #  types of map_type. The filtering arguments are optional ACL-like
@@ -120,12 +120,12 @@
 #  all referers are allowed.  Various combinations of * and ~ in a referer
 #  list can be used to create

[3/3] git commit: Fixed changes from merge.

2013-08-21 Thread zwoop

Fixed changes from merge.


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

Branch: refs/heads/4.0.x
Commit: c1e0681b2ace0f57066c166e776b883f55f76f35
Parents: 8975eec
Author: Leif Hedstrom zw...@apache.org
Authored: Wed Aug 21 10:52:25 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Wed Aug 21 10:52:25 2013 -0600

--
 CHANGES | 3 ---
 1 file changed, 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c1e0681b/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 84bffe3..afec95a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -28,9 +28,6 @@ Changes with Apache Traffic Server 4.0.0
v1.33, which is what RHEL5 ships with.
 
 
-  *) [TS-1597] Document remap.config filters
-Author: Jim Riggs j...@riggs.me
-
 Changes with Apache Traffic Server 3.3.5

Git Push Summary

2013-08-21 Thread zwoop

Updated Branches:
  refs/heads/5.0.x [created] be93cfbee

[2/2] git commit: Added TS-1919.

2013-08-21 Thread zwoop

Added TS-1919.


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

Branch: refs/heads/5.0.x
Commit: 812b668de63a387cabb0ff43e149817a5c79cb8a
Parents: 0627894
Author: Leif Hedstrom zw...@apache.org
Authored: Wed Aug 21 11:07:41 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Wed Aug 21 11:07:41 2013 -0600

--
 CHANGES | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/812b668d/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 4604c67..06e0960 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,10 @@
  -*- coding: utf-8 -*-
+Changes with Apache Traffic Server 5.0.0
+
+  *) [TS-1919] Eliminate CacheLookupHttpConfig. This breaks cluster
+   compatibility, so all cluster nodes should be upgraded simultaneously.
+
+
 Changes with Apache Traffic Server 4.1.0
 
   *) TS-2141: Inconsistent euid cause bad mgmtapi/eventapi sockets.

[1/2] git commit: TS-1919 Eliminate CacheLookupHttpConfig

2013-08-21 Thread zwoop

Updated Branches:
  refs/heads/5.0.x be93cfbee - 812b668de


TS-1919 Eliminate CacheLookupHttpConfig

This breaks compatibility with the cache clustering, so all nodes
in a cluster would have to be upgraded at the same time. This
eliminates an ugly passing of certain configurations through
the cluster channels into the cache core.

In addition, I think this can open up the possibility to make
some cache related configurations overridable. That should be
done as a different commit though.


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

Branch: refs/heads/5.0.x
Commit: 062789462cf34355627d35c8a2899d822e38950a
Parents: be93cfb
Author: Leif Hedstrom zw...@apache.org
Authored: Sat Jun 1 16:27:31 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Wed Aug 21 11:03:35 2013 -0600

--
 iocore/cache/Cache.cc   |   8 +-
 iocore/cache/CacheRead.cc   |  10 +--
 iocore/cache/I_Cache.h  |  15 ++--
 iocore/cache/P_CacheInternal.h  |  46 +--
 iocore/cache/P_CacheTest.h  |   1 -
 iocore/cluster/ClusterCache.cc  |  26 +++---
 iocore/cluster/P_ClusterCacheInternal.h |  15 ++--
 iocore/cluster/P_ClusterInline.h|  15 +---
 proxy/ICP.cc|   3 +-
 proxy/Prefetch.cc   |  19 ++---
 proxy/Prefetch.h|   2 +-
 proxy/http/HttpCacheSM.cc   |   8 +-
 proxy/http/HttpCacheSM.h|   9 +--
 proxy/http/HttpSM.cc|  15 +---
 proxy/http/HttpTransact.h   |   2 -
 proxy/http/HttpTransactCache.cc | 113 +++
 proxy/http/HttpTransactCache.h  |  61 ++-
 17 files changed, 87 insertions(+), 281 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/06278946/iocore/cache/Cache.cc
--
diff --git a/iocore/cache/Cache.cc b/iocore/cache/Cache.cc
index 66f2b70..fdf67b7 100644
--- a/iocore/cache/Cache.cc
+++ b/iocore/cache/Cache.cc
@@ -3189,15 +3189,15 @@ ink_cache_init(ModuleVersion v)
 //
 Action *
 CacheProcessor::open_read(Continuation *cont, URL *url, bool 
cluster_cache_local, CacheHTTPHdr *request,
-  CacheLookupHttpConfig *params, time_t pin_in_cache, 
CacheFragType type)
+  void *context, time_t pin_in_cache, CacheFragType 
type)
 {
 #ifdef CLUSTER_CACHE
   if (cache_clustering_enabled  0  !cluster_cache_local) {
-return open_read_internal(CACHE_OPEN_READ_LONG, cont, (MIOBuffer *) 0,
-  url, request, params, (CacheKey *) 0, 
pin_in_cache, type, (char *) 0, 0);
+return open_read_internal(CACHE_OPEN_READ_LONG, cont, (MIOBuffer *) 0, 
url, request, context,
+  (CacheKey *) 0, pin_in_cache, type, (char *) 0, 
0);
   }
 #endif
-  return caches[type]-open_read(cont, url, request, params, type);
+  return caches[type]-open_read(cont, url, request, context, type);
 }
 
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/06278946/iocore/cache/CacheRead.cc
--
diff --git a/iocore/cache/CacheRead.cc b/iocore/cache/CacheRead.cc
index 3c97305..6b8e897 100644
--- a/iocore/cache/CacheRead.cc
+++ b/iocore/cache/CacheRead.cc
@@ -90,7 +90,7 @@ Lcallreturn:
 #ifdef HTTP_CACHE
 Action *
 Cache::open_read(Continuation * cont, CacheKey * key, CacheHTTPHdr * request,
- CacheLookupHttpConfig * params, CacheFragType type, char 
*hostname, int host_len)
+ void * context, CacheFragType type, char *hostname, int 
host_len)
 {
 
   if (!CACHE_READY(type)) {
@@ -116,7 +116,7 @@ Cache::open_read(Continuation * cont, CacheKey * key, 
CacheHTTPHdr * request,
   CACHE_INCREMENT_DYN_STAT(c-base_stat + CACHE_STAT_ACTIVE);
   c-request.copy_shallow(request);
   c-frag_type = CACHE_FRAG_TYPE_HTTP;
-  c-params = params;
+  c-context = context;
   c-od = od;
 }
 if (!lock) {
@@ -243,7 +243,7 @@ CacheVC::openReadChooseWriter(int /* event ATS_UNUSED */, 
Event * /* e ATS_UNUSE
 }
 #ifdef FIXME_NONMODULAR
 if (cache_config_select_alternate) {
-  alternate_index = HttpTransactCache::SelectFromAlternates(vector, 
request, params);
+  alternate_index = HttpTransactCache::SelectFromAlternates(vector, 
request, static_castHttpConfigParams*(context));
   if (alternate_index  0)
 return -ECACHE_ALT_MISS;
 } else

[2/2] git commit: Update with the v4.0.0 version, and a new link to open upcoming bugs.

2013-08-21 Thread zwoop

Update with the v4.0.0 version, and a new link to open upcoming bugs.


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

Branch: refs/heads/4.0.x
Commit: fe2097fc927508f7d23c9ddb54de3e5f7bbc1eaf
Parents: 861a513
Author: Leif Hedstrom zw...@apache.org
Authored: Wed Aug 21 13:12:15 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Wed Aug 21 13:12:15 2013 -0600

--
 STATUS | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fe2097fc/STATUS
--
diff --git a/STATUS b/STATUS
index ee55da1..92ff99f 100644
--- a/STATUS
+++ b/STATUS
@@ -10,7 +10,7 @@ Release history:
 [NOTE that x.{odd}.z versions are strictly Alpha/Beta releases,
   while x.{even}.z versions are Stable/GA releases.]
 
-3.4.0   : Released on August XYZ, 2013
+4.0.0   : Released on August 30, 2013
 
 3.2.5   : Released on July 17, 2013
 3.2.4   : Released on January 25, 2013
@@ -39,9 +39,9 @@ Contributors looking for a mission:
 
 RELEASE SHOWSTOPPERS:
 
-A list of all bugs open for the next development release can be found at
+A list of all bugs open for the next release can be found at
 
-  http://s.apache.org/ts-next-dev
+  http://s.apache.org/ats-next
 
 
 RELEASE PROCESS

[1/2] git commit: Fix version for v4.0.0.

2013-08-21 Thread zwoop

Updated Branches:
  refs/heads/4.0.x c1e0681b2 - fe2097fc9


Fix version for v4.0.0.


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

Branch: refs/heads/4.0.x
Commit: 861a513f42ee071f60b08a0bebd3cf3262276216
Parents: c1e0681
Author: Leif Hedstrom zw...@apache.org
Authored: Wed Aug 21 13:10:36 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Wed Aug 21 13:10:36 2013 -0600

--
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/861a513f/configure.ac
--
diff --git a/configure.ac b/configure.ac
index 101a6d6..196e928 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,8 +32,8 @@
 # Version number is calculated as MAJOR * 100 + MINOR * 1000 + MICRO
 # Version string is in the form of MAJOR.MINOR.MICRO[sufix]
 #
-m4_define([TS_VERSION_S],[3.4.0])
-m4_define([TS_VERSION_N],[3004000])
+m4_define([TS_VERSION_S],[4.0.0])
+m4_define([TS_VERSION_N],[400])
 
 AC_INIT([Apache Traffic Server], TS_VERSION_S(), 
[d...@trafficserver.apache.org], 
[trafficserver],[http://trafficserver.apache.org])
 AC_PREREQ([2.59])

git commit: Updated with the new release process changes

2013-08-21 Thread zwoop

Updated Branches:
  refs/heads/master e1b4b11ce - d242aa4d8


Updated with the new release process changes


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

Branch: refs/heads/master
Commit: d242aa4d80918e1899e1dcbab6e14d8344b25ae1
Parents: e1b4b11
Author: Leif Hedstrom zw...@apache.org
Authored: Wed Aug 21 13:17:29 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Wed Aug 21 13:17:31 2013 -0600

--
 STATUS   | 24 +++-
 configure.ac |  4 ++--
 2 files changed, 13 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d242aa4d/STATUS
--
diff --git a/STATUS b/STATUS
index 2987880..ae6370c 100644
--- a/STATUS
+++ b/STATUS
@@ -1,4 +1,4 @@
-Traffic Server 3.3 STATUS:  
-*-text-*-
+Traffic Server 4.1 STATUS:  
-*-text-*-
 Last modified at [$Date$]
 
 The current version of this file can be found at:
@@ -7,9 +7,10 @@ The current version of this file can be found at:
 
 
 Release history:
-[NOTE that x.{odd}.z versions are strictly Alpha/Beta releases,
-  while x.{even}.z versions are Stable/GA releases.]
 
+4.0.0   : Released on Aug 30th, 2013
+
+3.3.5   : Released on Aug 16th, 2013
 3.3.4   : Released on June 10th, 2013
 3.3.2   : Released on April 18th, 2013
 3.3.1   : Released on March 12th, 2013
@@ -38,26 +39,23 @@ Contributors looking for a mission:
   * Open bugs in the bug database.
 
 
-RELEASE SHOWSTOPPERS:
+UPCOMING WORK:
 
-A list of all bugs open for the next development release can be found at
+A list of all bugs open for the next release can be found at
 
-  http://s.apache.org/ts-3.3.4
+  http://s.apache.org/ats-next
 
 
 RELEASE PROCESS
 
-The Traffic Server release process is documented at
-
-http://cwiki.apache.org/confluence/display/TS/ReleaseProcess
+The Traffic Server release process and support cycles are documented at
 
-The Traffic Server backport process is documented at
+https://cwiki.apache.org/confluence/display/TS/ReleaseProcess
 
-http://cwiki.apache.org/confluence/display/TS/Development+Process
+and
 
-The Traffic Server Road-Map and support cycles are documented at
+https://cwiki.apache.org/confluence/display/TS/New+Release+Processes
 
-https://cwiki.apache.org/confluence/display/TS/Release+and+Support+cycles
 
 Current status of all build systems is available at
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d242aa4d/configure.ac
--
diff --git a/configure.ac b/configure.ac
index c95ab43..015380e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,8 +32,8 @@
 # Version number is calculated as MAJOR * 100 + MINOR * 1000 + MICRO
 # Version string is in the form of MAJOR.MINOR.MICRO[sufix]
 #
-m4_define([TS_VERSION_S],[3.5.0-dev])
-m4_define([TS_VERSION_N],[3005000])
+m4_define([TS_VERSION_S],[4.1.0])
+m4_define([TS_VERSION_N],[4001000])
 
 AC_INIT([Apache Traffic Server], TS_VERSION_S(), 
[d...@trafficserver.apache.org], 
[trafficserver],[http://trafficserver.apache.org])
 AC_PREREQ([2.59])

git commit: Cleaned up.

2013-08-21 Thread zwoop

Updated Branches:
  refs/heads/4.0.x fe2097fc9 - 5c7d80886


Cleaned up.


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

Branch: refs/heads/4.0.x
Commit: 5c7d8088600ba3b3e900b3ab8044f07e2974afae
Parents: fe2097f
Author: Leif Hedstrom zw...@apache.org
Authored: Wed Aug 21 13:19:24 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Wed Aug 21 13:19:24 2013 -0600

--
 STATUS | 20 +++-
 1 file changed, 7 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5c7d8088/STATUS
--
diff --git a/STATUS b/STATUS
index 92ff99f..704d0b0 100644
--- a/STATUS
+++ b/STATUS
@@ -1,15 +1,12 @@
-Traffic Server 3.4 STATUS:  
-*-text-*-
+Traffic Server 4.0 STATUS:  
-*-text-*-
 Last modified at [$Date$]
 
 The current version of this file can be found at:
 
-  * 
https://git-wip-us.apache.org/repos/asf?p=trafficserver.git;a=blob;f=STATUS;hb=refs/heads/3.4.x
+  * 
https://git-wip-us.apache.org/repos/asf?p=trafficserver.git;a=blob;f=STATUS;hb=refs/heads/4.0.x
 
 
 Release history:
-[NOTE that x.{odd}.z versions are strictly Alpha/Beta releases,
-  while x.{even}.z versions are Stable/GA releases.]
-
 4.0.0   : Released on August 30, 2013
 
 3.2.5   : Released on July 17, 2013
@@ -37,7 +34,7 @@ Contributors looking for a mission:
   * Open bugs in the bug database.
 
 
-RELEASE SHOWSTOPPERS:
+UPCOMING WORK:
 
 A list of all bugs open for the next release can be found at
 
@@ -46,17 +43,14 @@ A list of all bugs open for the next release can be found at
 
 RELEASE PROCESS
 
-The Traffic Server release process is documented at
-
-http://cwiki.apache.org/confluence/display/TS/ReleaseProcess
+The Traffic Server release process and support cycles are documented at
 
-The Traffic Server backport process is documented at
+https://cwiki.apache.org/confluence/display/TS/ReleaseProcess
 
-http://cwiki.apache.org/confluence/display/TS/Development+Process
+and
 
-The Traffic Server Road-Map and support cycles are documented at
+https://cwiki.apache.org/confluence/display/TS/New+Release+Processes
 
-https://cwiki.apache.org/confluence/display/TS/Release+and+Support+cycles
 
 Current status of all build systems is available at

git commit: Updated with new release process.

2013-08-21 Thread zwoop

Updated Branches:
  refs/heads/4.0.x 5c7d80886 - 1abcb09e9


Updated with new release process.


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

Branch: refs/heads/4.0.x
Commit: 1abcb09e9f895a5037b41ac314de1ad64d93e3eb
Parents: 5c7d808
Author: Leif Hedstrom zw...@apache.org
Authored: Wed Aug 21 14:58:44 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Wed Aug 21 15:00:38 2013 -0600

--
 doc/admin/getting-started.en.rst | 29 ++---
 1 file changed, 14 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1abcb09e/doc/admin/getting-started.en.rst
--
diff --git a/doc/admin/getting-started.en.rst b/doc/admin/getting-started.en.rst
index a97c065..ceb8cf5 100644
--- a/doc/admin/getting-started.en.rst
+++ b/doc/admin/getting-started.en.rst
@@ -26,24 +26,23 @@ Before you start
 
 
 Before you get started with Traffic Server you may have to decide which
-version you want to use. Traffic Server uses the same semantic
-versioning to denote stability as Apache
-`apr http://apr.apache.org/versioning.html`_ and
-`httpd http://httpd.apache.org/dev/release.html`_ do:
+version you want to use. Traffic Server follows the `Semantic Versioning
+http://semver.org`_ guidelines, in summary 
 
 A version is made of a version-triplet: *``MAJOR.MINOR.PATCH``*
 
-The most important thing that you need to know is that an *even
-``MINOR``* marks a production stable release (such as 3.0.3 and 3.2.5),
-while an *odd ``MINOR``* number marks a targeted at developers.
-
-Sometimes we speak of trunk, master, or when talking about actual
-releases, we will say -unstable, or -dev. All of these are
-interchangable: trunk or master or sometimes TIP or HEAD, refer to the
-latest code in a Version Control System. While -dev (or the
-unfortunately named -unstable) qualifies that a certain release
-3.3.1-dev is has not had seen enough testing to be seen as production
-ready.
+As of v4.0.0, there are no longer any development (or unstable) releases.
+All releases are considered stable and ready for production use, releases
+within a major version are always upgrade compatible. More details are
+available on the `Wiki page
+https://cwiki.apache.org/confluence/display/TS/New+Release+Processes`_.
+
+Sometimes we speak of trunk, master or HEAD, all of which are used
+interchangeably: trunk or master or sometimes TIP or HEAD, refer to the
+latest code in a Git Version Control System. Master is always kept releasable,
+and compatible with the current major release version. Incompatible changes
+are sometimes committed on a next-major release branch, for example we have
+the ``5.0.x`` branch where changes incompatible with 4.x are managed.
 
 If your distribution does not come with a prepackaged Traffic Server,
 please go to `downloads /downloads`_ to choose the version that you

[1/2] git commit: Undo 2143.

2013-08-23 Thread zwoop

Updated Branches:
  refs/heads/master 3a78753f5 - b323fde35


Undo 2143.


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

Branch: refs/heads/master
Commit: b323fde3588abdf3a06f309bacc090467b4f49d3
Parents: dec9a7f
Author: Leif Hedstrom zw...@apache.org
Authored: Fri Aug 23 09:22:47 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Fri Aug 23 09:23:31 2013 -0600

--
 CHANGES | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b323fde3/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 2d2e107..8e338f8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -41,8 +41,6 @@ Changes with Apache Traffic Server 4.1.0
 
 Changes with Apache Traffic Server 4.0.0
 
-  *) [TS-2143] Remove alarm email address support (and config).
-
   *) [TS-2127] Move hostdb.config to var/trafficserver, together with with the
host.db itself.

Git Push Summary

2013-08-23 Thread zwoop

Updated Tags:  refs/tags/4.0.0 [created] d3a668e5c

git commit: TS-2155 New RAT exclude file, and cleanup

2013-08-24 Thread zwoop

Updated Branches:
  refs/heads/master f63b27d52 - 9cc6fe6d4


TS-2155 New RAT exclude file, and cleanup

This creates a new RAT exclude file, using the regular expression syntax that
newer versions of RAT seems to like. This also cleans up some of the licenses
and adds a few where they were missing. No code / source was modified, so this
does not need to get backported.


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

Branch: refs/heads/master
Commit: 9cc6fe6d41ebde0b99a0bf465976b647545d273b
Parents: f63b27d
Author: Leif Hedstrom zw...@apache.org
Authored: Sat Aug 24 10:28:01 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Sat Aug 24 10:28:01 2013 -0600

--
 CHANGES | 16 ++--
 ci/coverity-model.cc| 18 +
 ci/rat-regex.txt| 39 +
 doc/arch/cache/cache-api.en.rst | 17 
 doc/arch/cache/cache-appendix.en.rst| 17 
 doc/arch/cache/cache-glossary.en.rst| 17 
 doc/arch/cache/common.defs  | 17 
 doc/arch/cache/tier-storage.en.rst  | 17 
 doc/ext/traffic-server.py   | 17 
 iocore/cache/Notes  | 18 +
 mgmt/stats/spec | 18 +
 proxy/msgs/TSMessages.mc| 83 
 proxy/msgs/TSMsgs.rc| 39 -
 tools/lighttpd_mod_generator/Makefile   | 20 +
 .../conf/lighttpd_11.conf   | 17 
 .../conf/lighttpd_13.conf   | 17 
 .../conf/lighttpd_15.conf   | 17 
 .../conf/lighttpd_17.conf   | 17 
 .../conf/lighttpd_19.conf   | 17 
 .../conf/lighttpd_20.conf   | 17 
 .../conf/lighttpd_22.conf   | 17 
 .../conf/lighttpd_24.conf   | 17 
 .../lighttpd_mod_generator/conf/lighttpd_3.conf | 17 
 .../lighttpd_mod_generator/conf/lighttpd_5.conf | 16 
 .../lighttpd_mod_generator/conf/lighttpd_7.conf | 16 
 .../lighttpd_mod_generator/conf/lighttpd_9.conf | 16 
 26 files changed, 427 insertions(+), 127 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9cc6fe6d/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 6a62e60..0fec2af 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,13 +2,19 @@
 Changes with Apache Traffic Server 4.1.0
 
 
-  *) [TS-2148] handle_cache_operation_on_forward_server_response ignores value 
of api_server_response_no_store
-Author: Corey Cossentino co...@cossentino.com
+  *) [TS-2155] Make a new RAT exclude file that uses the regular expressions
+   now supported. Also cleanup some of minor licensing discrepancies.
 
-  *) [TS-2147] Set server_share_sessions to 1 for 'internal' transactions in 
rfc5861 plugin.
+  *) [TS-2148] handle_cache_operation_on_forward_server_response ignores value
+of api_server_response_no_store.
+Author: Corey Cossentino co...@cossentino.com 
 
-  *) [TS-2107] split proxy.config.http.transaction_active_timeout_in to 
proxy.config.http.transaction_header_timeout_in
- and proxy.config.http.transaction_request_timeout_in.
+  *) [TS-2147] Set server_share_sessions to 1 for 'internal' transactions in
+   rfc5861 plugin.
+
+  *) [TS-2107] split proxy.config.http.transaction_active_timeout_in to
+ proxy.config.http.transaction_header_timeout_in and
+ proxy.config.http.transaction_request_timeout_in. 
 
   *) [TS-2114] buffer_upload plugin defines true and false
 Author: Kit Chan chanshu...@gmail.com

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9cc6fe6d/ci/coverity-model.cc
--
diff --git a/ci/coverity-model.cc b/ci/coverity-model.cc
index 9b83d0c..1f952a3 100644
--- a/ci/coverity-model.cc
+++ b/ci/coverity-model.cc
@@ -1,3 +1,21 @@
+/** 
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+License); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or

git commit: TS-2155 Include the RAT JAR file in ci/.

2013-08-24 Thread zwoop

Updated Branches:
  refs/heads/master 9cc6fe6d4 - a1d747ec5


TS-2155 Include the RAT JAR file in ci/.

This also excludes the ci directory from the distribution build
target.


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

Branch: refs/heads/master
Commit: a1d747ec559613355fd0066ff3b86413173a
Parents: 9cc6fe6
Author: Leif Hedstrom zw...@apache.org
Authored: Sat Aug 24 10:43:42 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Sat Aug 24 10:43:42 2013 -0600

--
 Makefile.am |   2 +-
 ci/apache-rat-0.11-SNAPSHOT.jar | Bin 0 - 1414641 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a1d747ec/Makefile.am
--
diff --git a/Makefile.am b/Makefile.am
index 093099b..d2caa5d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -56,7 +56,7 @@ asf-distdir:
@$(am__remove_distdir)
test -d .git  git clone . $(distdir) || svn export . $(distdir)
cd $(distdir)  autoreconf -i
-   rm -rf -- $(distdir)/autom4te.cache $(distdir)/.git 
$(distdir)/.gitignore
+   rm -rf -- $(distdir)/autom4te.cache $(distdir)/.git 
$(distdir)/.gitignore $(distdir)/ci
 
 asf-dist: asf-distdir
tardir=$(distdir)  $(am__tar) | bzip2 -9 -c $(distdir).tar.bz2

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a1d747ec/ci/apache-rat-0.11-SNAPSHOT.jar
--
diff --git a/ci/apache-rat-0.11-SNAPSHOT.jar b/ci/apache-rat-0.11-SNAPSHOT.jar
new file mode 100644
index 000..ab4bf46
Binary files /dev/null and b/ci/apache-rat-0.11-SNAPSHOT.jar differ

[1/2] git commit: TS-2154: Lua plugin asserts traffic_server on startup

2013-08-27 Thread zwoop

Updated Branches:
  refs/heads/4.0.x 426301d03 - c9e7328bb


TS-2154: Lua plugin asserts traffic_server on startup

The Lua plugin keep a number of per-instance hook tables. TS-1469
added a hook, but the Lua plugin was never updated, so we ended
passing a NULL continuation pointer to TSContDataSet() in
LuaPluginInstance::init(). Lets add the missing hook, and also add
a static assertion so that the next person do add a hook knows that
this requirement exists.


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

Branch: refs/heads/4.0.x
Commit: a08f3a739249d23dbef03de18dfac1bb7726b5a6
Parents: 426301d
Author: James Peach jpe...@apache.org
Authored: Mon Aug 26 16:52:08 2013 -0700
Committer: Leif Hedstrom zw...@apache.org
Committed: Tue Aug 27 08:30:16 2013 -0600

--
 CHANGES   | 6 +-
 plugins/experimental/lua/state.cc | 5 +
 2 files changed, 10 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a08f3a73/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 32a86b4..3f1d817 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,9 @@
  -*- coding: utf-8 -*-
+Changes with Apache Traffic Server 4.0.1
+
+  *) [TS-2154] Lua plugin asserts traffic_server on startup
+
+
 Changes with Apache Traffic Server 4.0.0
 
   *) [TS-2127] Move hostdb.config to var/trafficserver, together with with the
@@ -28,7 +33,6 @@ Changes with Apache Traffic Server 4.0.0
 
 Changes with Apache Traffic Server 3.3.5
 
-
   *) [TS-2051] Fix SSL crash due to excess READ_COMPLETE events.
 
   *) [TS-2099] Using wrong member when setting active timeout.

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a08f3a73/plugins/experimental/lua/state.cc
--
diff --git a/plugins/experimental/lua/state.cc 
b/plugins/experimental/lua/state.cc
index 01d357e..502e6fd 100644
--- a/plugins/experimental/lua/state.cc
+++ b/plugins/experimental/lua/state.cc
@@ -29,6 +29,10 @@
 
 #define INVALID_INSTANCE_ID (instanceid_t)(-1)
 
+// InitDemuxTable() requires an initializer for every hook. Make sure that we 
don't
+// get out of sync with the number of hooks.
+extern void * __static_assert_hook_count[TS_HTTP_LAST_HOOK == 17 ? 0 : -1];
+
 typedef int (*LuaHookDemuxer)(TSHttpHookID, TSCont, TSEvent, void *);
 
 template TSHttpHookID hookid, LuaHookDemuxer demuxer int
@@ -57,6 +61,7 @@ InitDemuxTable(LuaPluginInstance::demux_table_t table)
   table[TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK] = MakeLuaHook(demuxer, 
TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK);
   table[TS_HTTP_PRE_REMAP_HOOK] = MakeLuaHook(demuxer, 
TS_HTTP_PRE_REMAP_HOOK);
   table[TS_HTTP_POST_REMAP_HOOK]= MakeLuaHook(demuxer, 
TS_HTTP_POST_REMAP_HOOK);
+  table[TS_HTTP_RESPONSE_CLIENT_HOOK]   = MakeLuaHook(demuxer, 
TS_HTTP_RESPONSE_CLIENT_HOOK);
 }
 
 // Global storage for Lua plugin instances. We vend instanceid_t's as an index 
into

[2/2] git commit: Updated for v4.0.1 respin

2013-08-27 Thread zwoop

Updated for v4.0.1 respin


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

Branch: refs/heads/4.0.x
Commit: c9e7328bbf1d2d0794c0053fd4fbb5429d6b913a
Parents: a08f3a7
Author: Leif Hedstrom zw...@apache.org
Authored: Tue Aug 27 08:31:22 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Tue Aug 27 08:31:22 2013 -0600

--
 CHANGES  | 2 +-
 STATUS   | 2 +-
 configure.ac | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c9e7328b/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 3f1d817..3cf450c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,7 +4,7 @@ Changes with Apache Traffic Server 4.0.1
   *) [TS-2154] Lua plugin asserts traffic_server on startup
 
 
-Changes with Apache Traffic Server 4.0.0
+Changes with Apache Traffic Server 4.0.0 [not released]
 
   *) [TS-2127] Move hostdb.config to var/trafficserver, together with with the
host.db itself.

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c9e7328b/STATUS
--
diff --git a/STATUS b/STATUS
index 704d0b0..c1221b5 100644
--- a/STATUS
+++ b/STATUS
@@ -7,7 +7,7 @@ The current version of this file can be found at:
 
 
 Release history:
-4.0.0   : Released on August 30, 2013
+4.0.1   : Released on August 30, 2013
 
 3.2.5   : Released on July 17, 2013
 3.2.4   : Released on January 25, 2013

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c9e7328b/configure.ac
--
diff --git a/configure.ac b/configure.ac
index 196e928..05faa4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,8 +32,8 @@
 # Version number is calculated as MAJOR * 100 + MINOR * 1000 + MICRO
 # Version string is in the form of MAJOR.MINOR.MICRO[sufix]
 #
-m4_define([TS_VERSION_S],[4.0.0])
-m4_define([TS_VERSION_N],[400])
+m4_define([TS_VERSION_S],[4.0.1])
+m4_define([TS_VERSION_N],[401])
 
 AC_INIT([Apache Traffic Server], TS_VERSION_S(), 
[d...@trafficserver.apache.org], 
[trafficserver],[http://trafficserver.apache.org])
 AC_PREREQ([2.59])

git commit: Some indentation and printf cleanup

2013-08-27 Thread zwoop

Updated Branches:
  refs/heads/master d4930aba4 - 0aacb42a8


Some indentation and printf cleanup


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

Branch: refs/heads/master
Commit: 0aacb42a86ca19175520fd8be95644d1ed43b768
Parents: d4930ab
Author: Leif Hedstrom zw...@apache.org
Authored: Tue Aug 27 16:14:49 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Tue Aug 27 16:14:53 2013 -0600

--
 proxy/InkAPI.cc  | 6 --
 tools/jtest/jtest.cc | 1 -
 2 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0aacb42a/proxy/InkAPI.cc
--
diff --git a/proxy/InkAPI.cc b/proxy/InkAPI.cc
index 6ae68ea..ba36120 100644
--- a/proxy/InkAPI.cc
+++ b/proxy/InkAPI.cc
@@ -5209,7 +5209,8 @@ TSHttpTxnClientAddrGet(TSHttpTxn txnp)
 }
 
 sockaddr const*
-TSHttpSsnIncomingAddrGet(TSHttpSsn ssnp) {
+TSHttpSsnIncomingAddrGet(TSHttpSsn ssnp)
+{
   HttpClientSession *cs = reinterpret_castHttpClientSession *(ssnp);
 
   if (cs == NULL) return 0;
@@ -5220,7 +5221,8 @@ TSHttpSsnIncomingAddrGet(TSHttpSsn ssnp) {
   return vc-get_local_addr();
 }
 sockaddr const*
-TSHttpTxnIncomingAddrGet(TSHttpTxn txnp) {
+TSHttpTxnIncomingAddrGet(TSHttpTxn txnp)
+{
   sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
  
   TSHttpSsn ssnp = TSHttpTxnSsnGet(txnp);

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0aacb42a/tools/jtest/jtest.cc
--
diff --git a/tools/jtest/jtest.cc b/tools/jtest/jtest.cc
index d5013ba..13aadfc 100644
--- a/tools/jtest/jtest.cc
+++ b/tools/jtest/jtest.cc
@@ -2907,7 +2907,6 @@ int main(int argc __attribute__((unused)), char *argv[]) {
   server_fd = open_server(server_port + retry, accept_read);
   if (server_fd  0) {
 if (server_fd == -EADDRINUSE) {
-  printf(here\n);
   continue;
 }
 panic_perror(open_server);

git commit: Updated for v4.0.1

2013-08-27 Thread zwoop

Updated Branches:
  refs/heads/4.0.x c9e7328bb - 70d425aeb


Updated for v4.0.1


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

Branch: refs/heads/4.0.x
Commit: 70d425aeb7fdb161c568c989b03bb93ccebca569
Parents: c9e7328
Author: Leif Hedstrom zw...@apache.org
Authored: Tue Aug 27 11:01:13 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Tue Aug 27 11:01:13 2013 -0600

--
 CHANGES | 10 +++---
 1 file changed, 3 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/70d425ae/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 3cf450c..98ba1a7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,19 +1,15 @@
  -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 4.0.1
 
-  *) [TS-2154] Lua plugin asserts traffic_server on startup
-
-
-Changes with Apache Traffic Server 4.0.0 [not released]
+  *) [TS-2154] Lua plugin asserts traffic_server on startup.
 
   *) [TS-2127] Move hostdb.config to var/trafficserver, together with with the
host.db itself.
 
-  *) [TS-1823] remap.config line continuation support
+  *) [TS-1823] remap.config line continuation support.
 Author: Jim Riggs j...@riggs.me
 
-  *) [TS-1597] Document remap.config filters
-Author: Jim Riggs j...@riggs.me
+  *) [TS-1597] Document remap.config filters. Author: Jim Riggs j...@riggs.me
 
   *) [TS-2132, TS-2131] ${libexecdir} and $(localstatedir} chowned
needlessly chowned to to ATS' user.

git commit: TS-2161: TSHttpTxnHookAdd memory Leak

2013-08-27 Thread zwoop

Updated Branches:
  refs/heads/4.0.x 70d425aeb - f8d12ced9


TS-2161: TSHttpTxnHookAdd memory Leak

Make sure that the FeatureAPIHooks destructor correctly frees the
APIHook list.


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

Branch: refs/heads/4.0.x
Commit: f8d12ced9d92faa5e2e18b9f5331e89f140fde4b
Parents: 70d425a
Author: bettydramit b13621367...@gmail.com
Authored: Tue Aug 27 15:09:05 2013 -0700
Committer: Leif Hedstrom zw...@apache.org
Committed: Tue Aug 27 16:19:02 2013 -0600

--
 CHANGES| 3 +++
 proxy/InkAPIInternal.h | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f8d12ced/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 98ba1a7..bc3c184 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,9 @@ Changes with Apache Traffic Server 4.0.1
 
   *) [TS-2154] Lua plugin asserts traffic_server on startup.
 
+  *) [TS-2161] TSHttpTxnHookAdd memory Leak.
+Author: bettydramit b13621367...@gmail.com
+
   *) [TS-2127] Move hostdb.config to var/trafficserver, together with with the
host.db itself.
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f8d12ced/proxy/InkAPIInternal.h
--
diff --git a/proxy/InkAPIInternal.h b/proxy/InkAPIInternal.h
index f40af8e..fe10601 100644
--- a/proxy/InkAPIInternal.h
+++ b/proxy/InkAPIInternal.h
@@ -186,7 +186,7 @@ void
 FeatureAPIHooksID,MAX_ID::clear()
 {
   for (int i = 0; i  MAX_ID; ++i) {
-m_hooks-clear();
+m_hooks[i].clear();
   }
   hooks_p = false;
 }

Git Push Summary

2013-08-27 Thread zwoop

Updated Tags:  refs/tags/4.0.1 [created] e96205e61

Git Push Summary

2013-08-27 Thread zwoop

Updated Tags:  refs/tags/4.0.0 [deleted] d3a668e5c

[09/50] git commit: remove unused proxy_name from proxy/Main.cc

2013-08-30 Thread zwoop

remove unused proxy_name from proxy/Main.cc


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

Branch: refs/heads/5.0.x
Commit: 2e8f0c3523df5c264a694f82bd1bcd26d116ae83
Parents: b5190ac
Author: James Peach jpe...@apache.org
Authored: Wed Aug 21 16:36:06 2013 -0700
Committer: James Peach jpe...@apache.org
Committed: Wed Aug 21 16:36:06 2013 -0700

--
 proxy/Main.cc | 4 
 proxy/Main.h  | 1 -
 2 files changed, 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2e8f0c35/proxy/Main.cc
--
diff --git a/proxy/Main.cc b/proxy/Main.cc
index bd3151e..4a32593 100644
--- a/proxy/Main.cc
+++ b/proxy/Main.cc
@@ -142,7 +142,6 @@ extern int cache_clustering_enabled;
 char cluster_host[MAXDNAME + 1] = DEFAULT_CLUSTER_HOST;
 
 // = DEFAULT_CLUSTER_PORT_NUMBER;
-char proxy_name[MAXDNAME + 1] = unknown;
 static char command_string[512] = ;
 int remote_management_flag = DEFAULT_REMOTE_MANAGEMENT_FLAG;
 
@@ -1461,9 +1460,6 @@ main(int /* argc ATS_UNUSED */, char **argv)
   if (!command_flag  initialize_store())
 ProcessFatal(unable to initialize storage, (Re)Configuration required\n);
 
-  // Read proxy name
-  TS_ReadConfigString(proxy_name, proxy.config.proxy_name, 255);
-
   // Alter the frequecies at which the update threads will trigger
 #define SET_INTERVAL(scope, name, var) do { \
   RecInt tmpint; \

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2e8f0c35/proxy/Main.h
--
diff --git a/proxy/Main.h b/proxy/Main.h
index 867ddb3..d2f67d1 100644
--- a/proxy/Main.h
+++ b/proxy/Main.h
@@ -53,7 +53,6 @@ extern int fds_limit;
 extern int debug_level;
 extern char cluster_host[MAXDNAME + 1];
 extern int cluster_port_number;
-extern char proxy_name[MAXDNAME + 1];
 
 extern int remote_management_flag;
 extern char management_directory[PATH_NAME_MAX + 1];

[13/50] git commit: TS-2147: Set server_share_sessions to 1 for 'internal' transactions in rfc5861 plugin.

2013-08-30 Thread zwoop

TS-2147: Set server_share_sessions to 1 for 'internal' transactions in rfc5861 
plugin.


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

Branch: refs/heads/5.0.x
Commit: 145ed5ed4c483d33277940c5e62cd4914bbe0ae3
Parents: 6b9093b
Author: Jeff Elsloo jeff.els...@gmail.com
Authored: Thu Aug 22 10:09:56 2013 -0600
Committer: Phil Sorber sor...@apache.org
Committed: Thu Aug 22 10:12:27 2013 -0600

--
 CHANGES| 2 ++
 plugins/experimental/rfc5861/rfc5861.c | 1 +
 2 files changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/145ed5ed/CHANGES
--
diff --git a/CHANGES b/CHANGES
index cadbb34..2d2e107 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@
 Changes with Apache Traffic Server 4.1.0
 
 
+  *) [TS-2147] Set server_share_sessions to 1 for 'internal' transactions in 
rfc5861 plugin.
+
   *) [TS-2107] split proxy.config.http.transaction_active_timeout_in to 
proxy.config.http.transaction_header_timeout_in
  and proxy.config.http.transaction_request_timeout_in.
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/145ed5ed/plugins/experimental/rfc5861/rfc5861.c
--
diff --git a/plugins/experimental/rfc5861/rfc5861.c 
b/plugins/experimental/rfc5861/rfc5861.c
index 384aa91..7983690 100644
--- a/plugins/experimental/rfc5861/rfc5861.c
+++ b/plugins/experimental/rfc5861/rfc5861.c
@@ -569,6 +569,7 @@ rfc5861_plugin(TSCont cont, TSEvent event, void *edata)
 else
 {
 TSDebug(LOG_PREFIX, Internal Request); // This is 
insufficient if there are other plugins using TSHttpConnect
+TSHttpTxnConfigIntSet(txn, 
TS_CONFIG_HTTP_SHARE_SERVER_SESSIONS, 1);
 //TSHttpTxnHookAdd(txn, TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK, 
cont);
 TSHttpTxnHookAdd(txn, TS_HTTP_READ_RESPONSE_HDR_HOOK, cont);
 // This might be needed in 3.2.0 to fix a timeout issue

[04/50] git commit: TS-2114: removing true/false definition

2013-08-30 Thread zwoop

TS-2114: removing true/false definition


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

Branch: refs/heads/5.0.x
Commit: 04e5a40a372378c5804d694bc80912380fd5096c
Parents: fdfdc62
Author: Kit Chan chanshu...@gmail.com
Authored: Tue Aug 20 09:38:21 2013 -0700
Committer: James Peach jpe...@apache.org
Committed: Wed Aug 21 14:58:08 2013 -0700

--
 plugins/experimental/buffer_upload/buffer_upload.cc | 3 ---
 1 file changed, 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/04e5a40a/plugins/experimental/buffer_upload/buffer_upload.cc
--
diff --git a/plugins/experimental/buffer_upload/buffer_upload.cc 
b/plugins/experimental/buffer_upload/buffer_upload.cc
index 373818c..ae82135 100644
--- a/plugins/experimental/buffer_upload/buffer_upload.cc
+++ b/plugins/experimental/buffer_upload/buffer_upload.cc
@@ -42,9 +42,6 @@
 #include stdlib.h
 #include inttypes.h
 
-#define true 1
-#define false 0
-
 /* #define DEBUG 1 */
 #define DEBUG_TAG buffer_upload-dbg

[27/50] git commit: TS-2158: Properly mark an IP as non-routable for IPv4 and IPv6 link local addresses as well as IPv6 private addresses and IPv4 Carrier Grade NAT addresses from RFC 6598.

2013-08-30 Thread zwoop

TS-2158: Properly mark an IP as non-routable for IPv4 and IPv6 link local
addresses as well as IPv6 private addresses and IPv4 Carrier Grade NAT
addresses from RFC 6598.


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

Branch: refs/heads/5.0.x
Commit: af4fc8eba7e313a5a7fb5613382fd0165d44708b
Parents: 216ecda
Author: Phil Sorber sor...@apache.org
Authored: Mon Aug 26 13:42:46 2013 -0600
Committer: Phil Sorber sor...@apache.org
Committed: Mon Aug 26 13:43:41 2013 -0600

--
 CHANGES   |  4 
 lib/ts/ink_inet.h | 15 +++
 2 files changed, 15 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/af4fc8eb/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 0fec2af..7c41477 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
 Changes with Apache Traffic Server 4.1.0
 
 
+  *) [TS-2158] Properly mark an IP as non-routable for IPv4 and IPv6 link local
+   addresses as well as IPv6 private addresses and IPv4 Carrier Grade NAT
+   addresses from RFC 6598.
+
   *) [TS-2155] Make a new RAT exclude file that uses the regular expressions
now supported. Also cleanup some of minor licensing discrepancies.
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/af4fc8eb/lib/ts/ink_inet.h
--
diff --git a/lib/ts/ink_inet.h b/lib/ts/ink_inet.h
index 760c89c..21cf02b 100644
--- a/lib/ts/ink_inet.h
+++ b/lib/ts/ink_inet.h
@@ -571,11 +571,18 @@ inline bool ats_is_ip_nonroutable(sockaddr const* ip) {
   bool zret = false;
   if (ats_is_ip4(ip)) {
 in_addr_t a = ats_ip4_addr_cast(ip);
-zret = ((a  htonl(0xFF00)) == htonl(0x0A00)) ||
-  ((a  htonl(0x)) == htonl(0xC0A8)) ||
-  ((a  htonl(0xFFF0)) == htonl(0xAC10))
+zret = ((a  htonl(0xFF00)) == htonl(0x0A00)) || // priv 10.0.0.0/8
+  ((a  htonl(0xFFC0)) == htonl(0x6440)) ||  // priv 
100.64.0.0/10
+  ((a  htonl(0xFFF0)) == htonl(0xAC10)) ||  // priv 
172.16.0.0/12
+  ((a  htonl(0x)) == htonl(0xC0A8)) ||  // priv 
192.168.0.0/16
+  ((a  htonl(0x)) == htonl(0xA9FE)) // link 
169.254.0.0/16
   ;
-  } // should we do something for IPv6 addresses?
+  } else if (ats_is_ip6(ip)) {
+in6_addr a = ats_ip6_addr_cast(ip);
+zret = ((a.s6_addr[0]  0xFE) == 0xFC) || // priv 
fc00::/7
+  ((a.s6_addr[0] == 0xFE)  ((a.s6_addr[1]  0xC0) == 0x80)) // link 
fe80::/10
+  ;
+  }
   return zret;
 }

[39/50] git commit: TS-2161: TSHttpTxnHookAdd memory Leak

2013-08-30 Thread zwoop

TS-2161: TSHttpTxnHookAdd memory Leak

Make sure that the FeatureAPIHooks destructor correctly frees the
APIHook list.


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

Branch: refs/heads/5.0.x
Commit: d4930aba461ff8c1abb263f11838b0f8d45f82c8
Parents: fb20be5
Author: bettydramit b13621367...@gmail.com
Authored: Tue Aug 27 15:09:05 2013 -0700
Committer: James Peach jpe...@apache.org
Committed: Tue Aug 27 15:09:05 2013 -0700

--
 CHANGES| 3 +++
 proxy/InkAPIInternal.h | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d4930aba/CHANGES
--
diff --git a/CHANGES b/CHANGES
index c71119d..3fb0375 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 Changes with Apache Traffic Server 4.1.0
 
 
+  *) [TS-2161] TSHttpTxnHookAdd memory Leak
+Author: bettydramit b13621367...@gmail.com
+
   *) [TS-2156] Fix stats trap in different type of threads
 
   *) [TS-2160] Remove ats_is_ip_nonroutable and replace it with the less 
confusing

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d4930aba/proxy/InkAPIInternal.h
--
diff --git a/proxy/InkAPIInternal.h b/proxy/InkAPIInternal.h
index f40af8e..fe10601 100644
--- a/proxy/InkAPIInternal.h
+++ b/proxy/InkAPIInternal.h
@@ -186,7 +186,7 @@ void
 FeatureAPIHooksID,MAX_ID::clear()
 {
   for (int i = 0; i  MAX_ID; ++i) {
-m_hooks-clear();
+m_hooks[i].clear();
   }
   hooks_p = false;
 }

[46/50] git commit: ci: move jenkins jobs to the jenkins subdirectory

2013-08-30 Thread zwoop

ci: move jenkins jobs to the jenkins subdirectory


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

Branch: refs/heads/5.0.x
Commit: bf7f7da671c0b7e082cb7639e83564c4b4c83b92
Parents: 08c758e
Author: James Peach jpe...@apache.org
Authored: Thu Aug 29 14:38:41 2013 -0700
Committer: James Peach jpe...@apache.org
Committed: Thu Aug 29 14:38:41 2013 -0700

--
 ci/Makefile  |  21 --
 ci/jenkins.yaml  | 524 --
 ci/jenkins/Makefile  |  21 ++
 ci/jenkins/jobs.yaml | 524 ++
 4 files changed, 545 insertions(+), 545 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bf7f7da6/ci/Makefile
--
diff --git a/ci/Makefile b/ci/Makefile
deleted file mode 100644
index 95b3c1a..000
--- a/ci/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  License); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#  http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an AS IS BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-test:
-   [ -d xml ] || mkdir xml  jenkins-jobs test jenkins.yaml -o xml
-
-clean:
-   -rm -rf xml

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bf7f7da6/ci/jenkins.yaml
--
diff --git a/ci/jenkins.yaml b/ci/jenkins.yaml
deleted file mode 100644
index c6535e7..000
--- a/ci/jenkins.yaml
+++ /dev/null
@@ -1,524 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  License); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#  http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an AS IS BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-- defaults:
-name: global
-logrotate:
-daysToKeep: -1
-numToKeep: 2
-artifactDaysToKeep: -1
-artifactNumToKeep: 2
-triggers:
-- pollscm: 'H * * * *'
-
-- builder:
-name: linux-regression
-builders:
-- shell: |
-git clean -d -f -x -q
-mkdir -p ${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}
-autoreconf -fi
-- shell: |
-export DEB_BUILD_HARDENING
-./configure 
--prefix=${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER} 
--enable-experimental-plugins $ENABLE_WCCP $ENABLE_DEBUG
-- shell: make -j2 V=1
-- shell: make check
-- shell: make install
-- shell: |
-
${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}/bin/traffic_server -R 1
-- shell: |
-rm -rf ${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}
-
-- builder:
-name: linux-clang-regression
-builders:
-- shell: |
-git clean -d -f -x -q
-mkdir -p ${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}
-autoreconf -fi
-- shell: |
-export CC=clang
-export CXX=clang++
-export CXXFLAGS=-Qunused-arguments -std=c++11
-export WITH_LIBCPLUSPLUS=yes
-./configure 
--prefix=${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER} 
--enable-experimental-plugins $ENABLE_WCCP $ENABLE_DEBUG
-- shell: make -j2 V=1
-- shell: make check
-- shell: make install
-- shell: |
-
${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}/bin/traffic_server -R 1
-- shell: |
-

[1/2] git commit: TS-2163 Remove obsolete WDA and ACC alarms feature

2013-08-30 Thread zwoop

Updated Branches:
  refs/heads/master bf7f7da67 - 49b81c45c


TS-2163 Remove obsolete WDA and ACC alarms feature

This was done for an Inktomi specific customer plugin, and no longer applies
to the project. If we later decide it necessary, we should add new APIs which
let plugins register new alarms with the system for appropriate handling.

Reading the code, it looks to me like the Alarms code was intended to be
replaced as well, so this could be part of a code refactoring/replacement.


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

Branch: refs/heads/master
Commit: dbbc5a27462e6e1c9611e48619284a97d2f1df68
Parents: bf7f7da
Author: Leif Hedstrom zw...@apache.org
Authored: Fri Aug 30 09:12:45 2013 -0700
Committer: Leif Hedstrom zw...@apache.org
Committed: Fri Aug 30 09:14:13 2013 -0700

--
 lib/records/I_RecAlarms.h   |  8 -
 lib/records/I_RecSignals.h  |  8 -
 mgmt/Alarms.cc  | 76 
 mgmt/Alarms.h   | 10 --
 mgmt/BaseManager.h  | 11 --
 mgmt/LocalManager.cc| 17 -
 proxy/InkAPI.cc | 12 ---
 proxy/api/ts/experimental.h | 17 +
 8 files changed, 15 insertions(+), 144 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/dbbc5a27/lib/records/I_RecAlarms.h
--
diff --git a/lib/records/I_RecAlarms.h b/lib/records/I_RecAlarms.h
index 985c656..25bebb9 100644
--- a/lib/records/I_RecAlarms.h
+++ b/lib/records/I_RecAlarms.h
@@ -47,12 +47,4 @@
 #define REC_ALARM_PROXY_HTTP_CONGESTED_SERVER   20
 #define REC_ALARM_PROXY_HTTP_ALLEVIATED_SERVER  21
 
-#define REC_ALARM_WDA_BILLING_CONNECTION_DIED   100
-#define REC_ALARM_WDA_BILLING_CORRUPTED_DATA101
-#define REC_ALARM_WDA_XF_ENGINE_DOWN102
-#define REC_ALARM_WDA_RADIUS_CORRUPTED_PACKETS  103
-
-#define REC_ALARM_ACC_ALARMS_START  200
-#define REC_ALARM_ACC_ALARMS_END299
-
 #endif

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/dbbc5a27/lib/records/I_RecSignals.h
--
diff --git a/lib/records/I_RecSignals.h b/lib/records/I_RecSignals.h
index 0115e56..1461c45 100644
--- a/lib/records/I_RecSignals.h
+++ b/lib/records/I_RecSignals.h
@@ -45,12 +45,4 @@
 #define REC_SIGNAL_HTTP_CONGESTED_SERVER20
 #define REC_SIGNAL_HTTP_ALLEVIATED_SERVER   21
 
-#define REC_SIGNAL_WDA_BILLING_CONNECTION_DIED  100
-#define REC_SIGNAL_WDA_BILLING_CORRUPTED_DATA   101
-#define REC_SIGNAL_WDA_XF_ENGINE_DOWN   102
-#define REC_SIGNAL_WDA_RADIUS_CORRUPTED_PACKETS 103
-
-#define REC_SIGNAL_ACC_ALARMS_START 200
-#define REC_SIGNAL_ACC_ALARMS_END   299
-
 #endif

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/dbbc5a27/mgmt/Alarms.cc
--
diff --git a/mgmt/Alarms.cc b/mgmt/Alarms.cc
index 94fbbf8..c655d90 100644
--- a/mgmt/Alarms.cc
+++ b/mgmt/Alarms.cc
@@ -211,11 +211,6 @@ Alarms::signalAlarm(alarm_t a, const char *desc, const 
char *ip)
   case MGMT_ALARM_PROXY_HTTP_CONGESTED_SERVER:
   case MGMT_ALARM_PROXY_HTTP_ALLEVIATED_SERVER:
 return;
-  case MGMT_ALARM_WDA_BILLING_CONNECTION_DIED:
-  case MGMT_ALARM_WDA_BILLING_CORRUPTED_DATA:
-  case MGMT_ALARM_WDA_XF_ENGINE_DOWN:
-priority = 2;
-break;
   default:
 priority = 2;
 break;
@@ -225,19 +220,12 @@ Alarms::signalAlarm(alarm_t a, const char *desc, const 
char *ip)
   if (desc  (priority == 1 || priority == 2)  !ip) {
 
 if (strcmp(prev_alarm_text, desc) == 0) {   /* a repeated alarm */
-
-  /* INKqa11884: repeated wireless alarms always signalled */
-  if (a != MGMT_ALARM_WDA_BILLING_CONNECTION_DIED 
-  a != MGMT_ALARM_WDA_BILLING_CORRUPTED_DATA 
-  a != MGMT_ALARM_WDA_XF_ENGINE_DOWN) {
-
-time_t time_delta = time(0) - last_sent;
-if (time_delta  900) {
-  mgmt_log([Alarms::signalAlarm] Skipping Alarm: '%s'\n, desc);
-  return;
-} else {
-  last_sent = time(0);
-}
+  time_t time_delta = time(0) - last_sent;
+  if (time_delta  900) {
+mgmt_log([Alarms::signalAlarm] Skipping Alarm: '%s'\n, desc);
+return;
+  } else {
+last_sent = time(0);
   }
 } else {
   ink_strlcpy(prev_alarm_text, desc, sizeof(prev_alarm_text));
@@ -271,18 +259,8 @@ Alarms::signalAlarm(alarm_t a, const char *desc, const 
char *ip)
 }
 snprintf(buf, sizeof(buf), %d, a);
 if

[2/2] git commit: Added TS-2163

2013-08-30 Thread zwoop

Added TS-2163


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

Branch: refs/heads/master
Commit: 49b81c45cbc64d0b31a0a3ff5eaccff22b95a316
Parents: dbbc5a2
Author: Leif Hedstrom zw...@apache.org
Authored: Fri Aug 30 09:15:04 2013 -0700
Committer: Leif Hedstrom zw...@apache.org
Committed: Fri Aug 30 09:15:04 2013 -0700

--
 CHANGES | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/49b81c45/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 3fb0375..6ea4108 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
  -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 4.1.0
 
+  *) [TS-2163] Remove WDA_BILLING, ACC_ALARMS etc. code and definitions.
 
   *) [TS-2161] TSHttpTxnHookAdd memory Leak
 Author: bettydramit b13621367...@gmail.com

[37/50] git commit: doc: move cache glossary into the main glossary

2013-08-30 Thread zwoop

doc: move cache glossary into the main glossary


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

Branch: refs/heads/5.0.x
Commit: 463356348c87018bf3d9e22fc00fce2c92f11325
Parents: fc139c2
Author: James Peach jpe...@apache.org
Authored: Mon Aug 26 22:06:53 2013 -0700
Committer: James Peach jpe...@apache.org
Committed: Mon Aug 26 22:07:42 2013 -0700

--
 doc/arch/cache/cache-glossary.en.rst | 39 ---
 doc/arch/cache/cache.en.rst  |  2 --
 doc/glossary.en.rst  | 17 ++
 3 files changed, 17 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/46335634/doc/arch/cache/cache-glossary.en.rst
--
diff --git a/doc/arch/cache/cache-glossary.en.rst 
b/doc/arch/cache/cache-glossary.en.rst
deleted file mode 100755
index 7c433aa..000
--- a/doc/arch/cache/cache-glossary.en.rst
+++ /dev/null
@@ -1,39 +0,0 @@
-.. Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   License); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
-   
-   http://www.apache.org/licenses/LICENSE-2.0
-   
-   Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied.  See the License for the
-   specific language governing permissions and limitations
-   under the License.
-
-Glossary
-
-
-.. include:: common.defs
-
-.. glossary::
-:sorted:
-
-cache volume
-Persistent storage for the cache, defined and manipulable by the user. 
Cache volumes are defined in :file:`volume.config`. A cache volume is spread 
across :term:`storage unit`\ s to increase performance through parallel I/O. 
Storage units can be split across cache volumes. Each such part of a storage 
unit in a cache volume is a :term:`volume`.
-
-Implemented by the class :cpp:class:`CacheVol`.
-
-volume
-A homogenous persistent store for the cache. A volume always resides 
entirely on a single physical device and is treated as an undifferentiated span 
of bytes.
-
-Implemented by the class :cpp:class:`Vol`.
-
-See also :term:`storage unit`, :term:`cache volume`
-
-storage unit
-The physical storage described by a single line in 
:file:`storage.config`.

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/46335634/doc/arch/cache/cache.en.rst
--
diff --git a/doc/arch/cache/cache.en.rst b/doc/arch/cache/cache.en.rst
index c917209..43b5d84 100644
--- a/doc/arch/cache/cache.en.rst
+++ b/doc/arch/cache/cache.en.rst
@@ -27,8 +27,6 @@ Contents:
cache-data-structures.en
cache-api.en
cache-appendix.en
-   cache-glossary.en
tier-storage.en
 
-..   glossary
 ..   appendix

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/46335634/doc/glossary.en.rst
--
diff --git a/doc/glossary.en.rst b/doc/glossary.en.rst
index d33bf19..76accf9 100644
--- a/doc/glossary.en.rst
+++ b/doc/glossary.en.rst
@@ -20,6 +20,7 @@ Glossary
 =
 
 .. glossary::
+   :sorted:
 
continuation
   A callable object that contains state. These are are mechanism used by 
Traffic Server to implement callbacks and
@@ -34,3 +35,19 @@ Glossary
transaction
   A client request and response, either from the origin server or from the 
cache.
 
+   cache volume
+  Persistent storage for the cache, defined and manipulable by the user.
+  Cache volumes are defined in :file:`volume.config`. A cache volume is
+  spread across :term:`storage unit`\ s to increase performance through
+  parallel I/O. Storage units can be split across cache volumes. Each
+  such part of a storage unit in a cache volume is a :term:`volume`.
+
+   volume
+  A homogenous persistent store for the cache. A volume always resides
+  entirely on a single physical device and is treated as an
+  undifferentiated span of bytes.
+
+  See also :term:`storage unit`, :term:`cache volume`
+
+   storage unit
+  The physical storage described by a single line in 
:file:`storage.config`.

[05/50] git commit: doc: document proxy.config.url_remap.filename

2013-08-30 Thread zwoop

doc: document proxy.config.url_remap.filename


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

Branch: refs/heads/5.0.x
Commit: 87ccd262e53911d5b8a8b86f27d8b5ddf80b7133
Parents: db31fe5
Author: James Peach jpe...@apache.org
Authored: Wed Aug 21 15:48:27 2013 -0700
Committer: James Peach jpe...@apache.org
Committed: Wed Aug 21 15:48:27 2013 -0700

--
 doc/reference/configuration/records.config.en.rst | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/87ccd262/doc/reference/configuration/records.config.en.rst
--
diff --git a/doc/reference/configuration/records.config.en.rst 
b/doc/reference/configuration/records.config.en.rst
index 1347173..08d081d 100644
--- a/doc/reference/configuration/records.config.en.rst
+++ b/doc/reference/configuration/records.config.en.rst
@@ -1595,6 +1595,10 @@ Reverse Proxy
 URL Remap Rules
 ===
 
+.. ts:cv:: CONFIG proxy.config.url_remap.filename STRING remap.config
+
+   Sets the name of the :file:`remap.config` file.
+
 .. ts:cv:: CONFIG proxy.config.url_remap.default_to_server_pac INT 0
:reloadable:

[15/50] git commit: Undo 2143.

2013-08-30 Thread zwoop

Undo 2143.


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

Branch: refs/heads/5.0.x
Commit: b323fde3588abdf3a06f309bacc090467b4f49d3
Parents: dec9a7f
Author: Leif Hedstrom zw...@apache.org
Authored: Fri Aug 23 09:22:47 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Fri Aug 23 09:23:31 2013 -0600

--
 CHANGES | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b323fde3/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 2d2e107..8e338f8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -41,8 +41,6 @@ Changes with Apache Traffic Server 4.1.0
 
 Changes with Apache Traffic Server 4.0.0
 
-  *) [TS-2143] Remove alarm email address support (and config).
-
   *) [TS-2127] Move hostdb.config to var/trafficserver, together with with the
host.db itself.

[34/50] git commit: TS-2160: Remove use of ats_is_ip_nonroutable and replace with ats_is_ip_linklocal and ats_is_ip_private.

2013-08-30 Thread zwoop

TS-2160: Remove use of ats_is_ip_nonroutable and replace with
ats_is_ip_linklocal and ats_is_ip_private.


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

Branch: refs/heads/5.0.x
Commit: 3c78ec9a6161aa46bec14628fc048f6c9f25a78f
Parents: bf34ca0
Author: Phil Sorber sor...@apache.org
Authored: Mon Aug 26 21:24:18 2013 -0600
Committer: Phil Sorber sor...@apache.org
Committed: Mon Aug 26 21:24:18 2013 -0600

--
 iocore/utils/Machine.cc | 10 ++
 lib/ts/ink_inet.cc  | 10 ++
 2 files changed, 12 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3c78ec9a/iocore/utils/Machine.cc
--
diff --git a/iocore/utils/Machine.cc b/iocore/utils/Machine.cc
index 3e555e4..fdc089c 100644
--- a/iocore/utils/Machine.cc
+++ b/iocore/utils/Machine.cc
@@ -99,9 +99,10 @@ Machine::Machine(char const* the_hostname, sockaddr const* 
addr)
   enum {
 NA, // Not an (IP) Address.
 LO, // Loopback.
-NR, // Non-Routable.
+LL, // Link Local
+PR, // Private.
 MC, // Multicast.
-GA  // Globally unique Address.
+GL  // Global.
   } spot_type = NA, ip4_type = NA, ip6_type = NA;
   sockaddr const* ifip;
   for (
@@ -119,9 +120,10 @@ Machine::Machine(char const* the_hostname, sockaddr const* 
addr)
 
 if (!ats_is_ip(ifip)) spot_type = NA;
 else if (ats_is_ip_loopback(ifip)) spot_type = LO;
-else if (ats_is_ip_nonroutable(ifip)) spot_type = NR;
+else if (ats_is_ip_linklocal(ifip)) spot_type = LL;
+else if (ats_is_ip_private(ifip)) spot_type = PR;
 else if (ats_is_ip_multicast(ifip)) spot_type = MC;
-else spot_type = GA;
+else spot_type = GL;
 
 if (spot_type == NA) continue; // Next!
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3c78ec9a/lib/ts/ink_inet.cc
--
diff --git a/lib/ts/ink_inet.cc b/lib/ts/ink_inet.cc
index 8948b91..7ec7c6a 100644
--- a/lib/ts/ink_inet.cc
+++ b/lib/ts/ink_inet.cc
@@ -401,9 +401,10 @@ ats_ip_getbestaddrinfo(char const* host,
   enum {
 NA, // Not an (IP) Address.
 LO, // Loopback.
+LL, // Link Local.
+PR, // Private.
 MC, // Multicast.
-NR, // Non-Routable.
-GA  // Globally unique Address.
+GL  // Global.
   } spot_type = NA, ip4_type = NA, ip6_type = NA;
   sockaddr const* ip4_src = 0;
   sockaddr const* ip6_src = 0;
@@ -415,9 +416,10 @@ ats_ip_getbestaddrinfo(char const* host,
 sockaddr const* ai_ip = ai_spot-ai_addr;
 if (!ats_is_ip(ai_ip)) spot_type = NA;
 else if (ats_is_ip_loopback(ai_ip)) spot_type = LO;
-else if (ats_is_ip_nonroutable(ai_ip)) spot_type = NR;
+else if (ats_is_ip_linklocal(ai_ip)) spot_type = LL;
+else if (ats_is_ip_private(ai_ip)) spot_type = PR;
 else if (ats_is_ip_multicast(ai_ip)) spot_type = MC;
-else spot_type = GA;
+else spot_type = GL;
 
 if (spot_type == NA) continue; // Next!

[40/50] git commit: Some indentation and printf cleanup

2013-08-30 Thread zwoop

Some indentation and printf cleanup


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

Branch: refs/heads/5.0.x
Commit: 0aacb42a86ca19175520fd8be95644d1ed43b768
Parents: d4930ab
Author: Leif Hedstrom zw...@apache.org
Authored: Tue Aug 27 16:14:49 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Tue Aug 27 16:14:53 2013 -0600

--
 proxy/InkAPI.cc  | 6 --
 tools/jtest/jtest.cc | 1 -
 2 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0aacb42a/proxy/InkAPI.cc
--
diff --git a/proxy/InkAPI.cc b/proxy/InkAPI.cc
index 6ae68ea..ba36120 100644
--- a/proxy/InkAPI.cc
+++ b/proxy/InkAPI.cc
@@ -5209,7 +5209,8 @@ TSHttpTxnClientAddrGet(TSHttpTxn txnp)
 }
 
 sockaddr const*
-TSHttpSsnIncomingAddrGet(TSHttpSsn ssnp) {
+TSHttpSsnIncomingAddrGet(TSHttpSsn ssnp)
+{
   HttpClientSession *cs = reinterpret_castHttpClientSession *(ssnp);
 
   if (cs == NULL) return 0;
@@ -5220,7 +5221,8 @@ TSHttpSsnIncomingAddrGet(TSHttpSsn ssnp) {
   return vc-get_local_addr();
 }
 sockaddr const*
-TSHttpTxnIncomingAddrGet(TSHttpTxn txnp) {
+TSHttpTxnIncomingAddrGet(TSHttpTxn txnp)
+{
   sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
  
   TSHttpSsn ssnp = TSHttpTxnSsnGet(txnp);

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0aacb42a/tools/jtest/jtest.cc
--
diff --git a/tools/jtest/jtest.cc b/tools/jtest/jtest.cc
index d5013ba..13aadfc 100644
--- a/tools/jtest/jtest.cc
+++ b/tools/jtest/jtest.cc
@@ -2907,7 +2907,6 @@ int main(int argc __attribute__((unused)), char *argv[]) {
   server_fd = open_server(server_port + retry, accept_read);
   if (server_fd  0) {
 if (server_fd == -EADDRINUSE) {
-  printf(here\n);
   continue;
 }
 panic_perror(open_server);

[06/50] git commit: remove unnecessary Connection::setup_mc_send() compatibility wrapper

2013-08-30 Thread zwoop

remove unnecessary Connection::setup_mc_send() compatibility wrapper


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

Branch: refs/heads/5.0.x
Commit: 9e6ad5cdf1fe903ef1d6be4f72c79f90a21f89a5
Parents: 36059e2
Author: James Peach jpe...@apache.org
Authored: Wed Aug 21 15:58:52 2013 -0700
Committer: James Peach jpe...@apache.org
Committed: Wed Aug 21 16:01:13 2013 -0700

--
 iocore/net/P_Connection.h | 22 --
 1 file changed, 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9e6ad5cd/iocore/net/P_Connection.h
--
diff --git a/iocore/net/P_Connection.h b/iocore/net/P_Connection.h
index e974a37..7abaa8e 100644
--- a/iocore/net/P_Connection.h
+++ b/iocore/net/P_Connection.h
@@ -130,28 +130,6 @@ struct Connection
 bool non_blocking = NON_BLOCKING,
 unsigned char mc_ttl = 1, bool mc_loopback = 
DISABLE_MC_LOOPBACK, Continuation * c = NULL);
 
-  /**
-@deprecated preserve backward compatibility with non-IPv6 iocore
-  */
-
-  int setup_mc_send(unsigned int mc_ip, int mc_port,
-unsigned int my_ip, int my_port,
-bool non_blocking = NON_BLOCKING,
-unsigned char mc_ttl = 1, bool mc_loopback = 
DISABLE_MC_LOOPBACK, Continuation * c = NULL)
-  {
-struct sockaddr_in mc_addr;
-struct sockaddr_in my_addr;
-
-ats_ip4_set(mc_addr, mc_ip, htons(mc_port));
-ats_ip4_set(my_addr, my_ip, htons(my_port));
-
-return setup_mc_send(
-ats_ip_sa_cast(mc_addr), 
-ats_ip_sa_cast(my_addr), 
-non_blocking, mc_ttl, mc_loopback, c);
-  } 
-
-
   int setup_mc_receive(sockaddr const* from,
bool non_blocking = NON_BLOCKING, Connection * sendchan 
= NULL, Continuation * c = NULL);

[21/50] git commit: Quick fix - URL handling slow request logging.

2013-08-30 Thread zwoop

Quick fix - URL handling slow request logging.


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

Branch: refs/heads/5.0.x
Commit: c290ce0df2ab019853114599a3a63e6faf82dadb
Parents: a7f66ae
Author: Alan M. Carroll a...@network-geographics.com
Authored: Fri Aug 23 22:32:11 2013 -0500
Committer: Alan M. Carroll a...@network-geographics.com
Committed: Fri Aug 23 22:32:11 2013 -0500

--
 proxy/http/HttpSM.cc | 11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c290ce0d/proxy/http/HttpSM.cc
--
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index 4b7b008..92bd92c 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -6588,16 +6588,15 @@ HttpSM::update_stats()
   // print slow requests if the threshold is set ( 0) and if we are over the 
time threshold
   if (t_state.http_config_param-slow_log_threshold != 0 
   ink_hrtime_from_msec(t_state.http_config_param-slow_log_threshold)  
total_time) {
-// get the url to log
-URL *url = t_state.hdr_info.client_request.url_get();
+URL* url = t_state.hdr_info.client_request.url_get();
 char url_string[256] = ;
-if (url != NULL  url-valid()) {
-  url-string_get_buf(url_string, sizeof(url_string));
-}
+
+t_state.hdr_info.client_request.url_print(url_string, sizeof url_string, 
0, 0);
 
 // unique id
 char unique_id_string[128] = ;
-if (url != NULL  url-valid()) {
+// [amc] why do we check the URL to get a MIME field?
+if (0 != url  url-valid()) {
   int length = 0;
   const char *field = 
t_state.hdr_info.client_request.value_get(MIME_FIELD_X_ID, MIME_LEN_X_ID, 
length);
   if (field != NULL) {

[07/50] git commit: TS-2116: create buffer_upload temp files with mode 0600

2013-08-30 Thread zwoop

TS-2116: create buffer_upload temp files with mode 0600


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

Branch: refs/heads/5.0.x
Commit: 36059e207307e90be17871ba5ddeb72ceecc4193
Parents: 87ccd26
Author: James Peach jpe...@apache.org
Authored: Wed Aug 21 16:00:41 2013 -0700
Committer: James Peach jpe...@apache.org
Committed: Wed Aug 21 16:01:13 2013 -0700

--
 plugins/experimental/buffer_upload/buffer_upload.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36059e20/plugins/experimental/buffer_upload/buffer_upload.cc
--
diff --git a/plugins/experimental/buffer_upload/buffer_upload.cc 
b/plugins/experimental/buffer_upload/buffer_upload.cc
index ae82135..fc496e4 100644
--- a/plugins/experimental/buffer_upload/buffer_upload.cc
+++ b/plugins/experimental/buffer_upload/buffer_upload.cc
@@ -916,7 +916,7 @@ attach_pvc_plugin(TSCont /* contp ATS_UNUSED */, TSEvent 
event, void *edata)
   my_state-filename = tempnam(path, NULL);
   TSDebug(DEBUG_TAG, temp filename: %s, my_state-filename);
 
-  my_state-fd = open(my_state-filename, O_RDWR | O_NONBLOCK | O_TRUNC | 
O_CREAT);
+  my_state-fd = open(my_state-filename, O_RDWR | O_NONBLOCK | O_TRUNC | 
O_CREAT, 0600);
   if (my_state-fd  0) {
 LOG_ERROR(open);
 uconfig-use_disk_buffer = 0;

[11/50] git commit: TS-2137: Use relative timeout in EventNotify::timedwait()

2013-08-30 Thread zwoop

TS-2137: Use relative timeout in EventNotify::timedwait()

1) Use relative timeout in EventNotify::timedwait() function.
2) Remove unused m_name variable.
3) Use the correct marco HAVE_EVENTFD instead of TS_HAS_EVENTFD which
   is outdated.

Signed-off-by: Yunkai Zhang qiushu@taobao.com


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

Branch: refs/heads/5.0.x
Commit: fa176442f45a3d5e8a9dce332775172192f53f34
Parents: e5d2729
Author: Yunkai Zhang qiushu@taobao.com
Authored: Thu Aug 22 16:13:36 2013 +0800
Committer: Yunkai Zhang qiushu@taobao.com
Committed: Thu Aug 22 19:56:02 2013 +0800

--
 lib/ts/EventNotify.cc | 39 +++
 lib/ts/EventNotify.h  |  7 +++
 2 files changed, 22 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fa176442/lib/ts/EventNotify.cc
--
diff --git a/lib/ts/EventNotify.cc b/lib/ts/EventNotify.cc
index 5d0cc53..3a499b6 100644
--- a/lib/ts/EventNotify.cc
+++ b/lib/ts/EventNotify.cc
@@ -30,14 +30,14 @@
 #include EventNotify.h
 #include ink_hrtime.h
 
-#ifdef TS_HAS_EVENTFD
+#ifdef HAVE_EVENTFD
 #include sys/eventfd.h
 #include sys/epoll.h
 #endif
 
-EventNotify::EventNotify(const char *name): m_name(name)
+EventNotify::EventNotify()
 {
-#ifdef TS_HAS_EVENTFD
+#ifdef HAVE_EVENTFD
   int ret;
   struct epoll_event ev;
 
@@ -59,14 +59,14 @@ EventNotify::EventNotify(const char *name): m_name(name)
   ink_release_assert(ret != -1);
 #else
   ink_cond_init(m_cond);
-  ink_mutex_init(m_mutex, m_name);
+  ink_mutex_init(m_mutex, NULL);
 #endif
 }
 
 void
 EventNotify::signal(void)
 {
-#ifdef TS_HAS_EVENTFD
+#ifdef HAVE_EVENTFD
   ssize_t nr;
   uint64_t value = 1;
   nr = write(m_event_fd, value, sizeof(uint64_t));
@@ -79,7 +79,7 @@ EventNotify::signal(void)
 void
 EventNotify::wait(void)
 {
-#ifdef TS_HAS_EVENTFD
+#ifdef HAVE_EVENTFD
   ssize_t nr;
   uint64_t value = 0;
   nr = read(m_event_fd, value, sizeof(uint64_t));
@@ -90,20 +90,13 @@ EventNotify::wait(void)
 }
 
 int
-EventNotify::timedwait(ink_timestruc *abstime)
+EventNotify::timedwait(int timeout) // milliseconds
 {
-#ifdef TS_HAS_EVENTFD
-  int timeout;
+#ifdef HAVE_EVENTFD
   ssize_t nr, nr_fd = 0;
   uint64_t value = 0;
-  struct timeval curtime;
   struct epoll_event ev;
 
-  // Convert absolute time to relative time
-  gettimeofday(curtime, NULL);
-  timeout = (abstime-tv_sec - curtime.tv_sec) * 1000
-  + (abstime-tv_nsec / 1000  - curtime.tv_usec) / 1000;
-
   //
   // When timeout  0, epoll_wait() will wait indefinitely, but
   // pthread_cond_timedwait() will return ETIMEDOUT immediately.
@@ -126,14 +119,20 @@ EventNotify::timedwait(ink_timestruc *abstime)
 
   return 0;
 #else
-  return ink_cond_timedwait(m_cond, m_mutex, abstime);
+  ink_timestruc abstime;
+  ink_hrtime curtime;
+
+  curtime = ink_get_hrtime_internal() + timeout * HRTIME_MSECOND;
+  abstime = ink_based_hrtime_to_timespec(curtime);
+
+  return ink_cond_timedwait(m_cond, m_mutex, abstime);
 #endif
 }
 
 void
 EventNotify::lock(void)
 {
-#ifdef TS_HAS_EVENTFD
+#ifdef HAVE_EVENTFD
   // do nothing
 #else
   ink_mutex_acquire(m_mutex);
@@ -143,7 +142,7 @@ EventNotify::lock(void)
 bool
 EventNotify::trylock(void)
 {
-#ifdef TS_HAS_EVENTFD
+#ifdef HAVE_EVENTFD
   return true;
 #else
   return ink_mutex_try_acquire(m_mutex);
@@ -153,7 +152,7 @@ EventNotify::trylock(void)
 void
 EventNotify::unlock(void)
 {
-#ifdef TS_HAS_EVENTFD
+#ifdef HAVE_EVENTFD
   // do nothing
 #else
   ink_mutex_release(m_mutex);
@@ -162,7 +161,7 @@ EventNotify::unlock(void)
 
 EventNotify::~EventNotify()
 {
-#ifdef TS_HAS_EVENTFD
+#ifdef HAVE_EVENTFD
   close(m_event_fd);
   close(m_epoll_fd);
 #else

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fa176442/lib/ts/EventNotify.h
--
diff --git a/lib/ts/EventNotify.h b/lib/ts/EventNotify.h
index 16e4809..135f037 100644
--- a/lib/ts/EventNotify.h
+++ b/lib/ts/EventNotify.h
@@ -33,18 +33,17 @@
 class EventNotify
 {
 public:
-  EventNotify(const char *name = NULL);
+  EventNotify();
   void signal(void);
   void wait(void);
-  int timedwait(ink_timestruc *abstime);
+  int timedwait(int timeout); // milliseconds
   void lock(void);
   bool trylock(void);
   void unlock(void);
   ~EventNotify();
 
 private:
-  const char *m_name;
-#ifdef TS_HAS_EVENTFD
+#ifdef HAVE_EVENTFD
   int m_event_fd;
   int m_epoll_fd;
 #else

[02/50] git commit: TS-2116: Making buffer_upload compile

2013-08-30 Thread zwoop

TS-2116: Making buffer_upload compile


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

Branch: refs/heads/5.0.x
Commit: fdfdc624348d02eecc606b68e2d4390fed2249bf
Parents: 0f585e9
Author: Kit Chan chanshu...@gmail.com
Authored: Tue Aug 20 09:23:03 2013 -0700
Committer: James Peach jpe...@apache.org
Committed: Wed Aug 21 14:58:04 2013 -0700

--
 configure.ac|  1 +
 plugins/experimental/Makefile.am|  1 +
 plugins/experimental/buffer_upload/Makefile.am  | 21 
 .../experimental/buffer_upload/buffer_upload.cc | 53 +---
 4 files changed, 57 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fdfdc624/configure.ac
--
diff --git a/configure.ac b/configure.ac
index 015380e..8765984 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1846,6 +1846,7 @@ AC_CONFIG_FILES([
   plugins/conf_remap/Makefile
   plugins/experimental/Makefile
   plugins/experimental/authproxy/Makefile
+  plugins/experimental/buffer_upload/Makefile
   plugins/experimental/channel_stats/Makefile
   plugins/experimental/custom_redirect/Makefile
   plugins/experimental/esi/Makefile

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fdfdc624/plugins/experimental/Makefile.am
--
diff --git a/plugins/experimental/Makefile.am b/plugins/experimental/Makefile.am
index d284623..bb97af1 100644
--- a/plugins/experimental/Makefile.am
+++ b/plugins/experimental/Makefile.am
@@ -17,6 +17,7 @@
 if BUILD_EXPERIMENTAL_PLUGINS
 SUBDIRS = \
  lua \
+ buffer_upload \
  esi \
  rfc5861 \
  tcp_info \

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fdfdc624/plugins/experimental/buffer_upload/Makefile.am
--
diff --git a/plugins/experimental/buffer_upload/Makefile.am 
b/plugins/experimental/buffer_upload/Makefile.am
new file mode 100644
index 000..d21c09e
--- /dev/null
+++ b/plugins/experimental/buffer_upload/Makefile.am
@@ -0,0 +1,21 @@
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  License); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an AS IS BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+include $(top_srcdir)/build/plugins.mk
+
+pkglib_LTLIBRARIES = buffer_upload.la
+buffer_upload_la_SOURCES = buffer_upload.cc
+buffer_upload_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fdfdc624/plugins/experimental/buffer_upload/buffer_upload.cc
--
diff --git a/plugins/experimental/buffer_upload/buffer_upload.cc 
b/plugins/experimental/buffer_upload/buffer_upload.cc
index 847c519..373818c 100644
--- a/plugins/experimental/buffer_upload/buffer_upload.cc
+++ b/plugins/experimental/buffer_upload/buffer_upload.cc
@@ -40,6 +40,7 @@
 #include dirent.h
 #include unistd.h
 #include stdlib.h
+#include inttypes.h
 
 #define true 1
 #define false 0
@@ -64,7 +65,6 @@
 #define VALID_PTR(X) (X != NULL)
 #define NOT_VALID_PTR(X) (X == NULL)
 
-
 struct upload_config_t
 {
   bool use_disk_buffer;
@@ -181,7 +181,7 @@ write_buffer_to_disk(TSIOBufferReader reader, pvc_state * 
my_state, TSCont contp
   LOG_ERROR_AND_RETURN(TSAIOWrite);
 }
 memcpy(pBuf, ptr, size);
-if (TSAIOWrite(my_state-fd, my_state-write_offset, pBuf, size, contp)  
0) {
+if (TSAIOWrite(my_state-fd, my_state-write_offset, pBuf, size, contp) == 
TS_ERROR) {
   LOG_ERROR_AND_RETURN(TSAIOWrite);
 }
 my_state-write_offset += size;
@@ -675,7 +675,7 @@ convert_url_func(TSMBuffer req_bufp, TSMLoc req_loc)
 }
 
 static int
-attach_pvc_plugin(TSCont contp, TSEvent event, void *edata)
+attach_pvc_plugin(TSCont /* contp ATS_UNUSED */, TSEvent event, void *edata)
 {
   TSHttpTxn txnp = (TSHttpTxn) edata;
   TSMutex mutex;
@@ -690,30 +690,41 @@

[26/50] git commit: Doc: Add glossary, fix type API reference page.

2013-08-30 Thread zwoop

Doc: Add glossary, fix type API reference page.


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

Branch: refs/heads/5.0.x
Commit: 216ecdabf3b69cc2fefd1d864c86a228d0c26819
Parents: a1d747e
Author: Alan M. Carroll a...@network-geographics.com
Authored: Mon Aug 26 14:12:15 2013 -0500
Committer: Alan M. Carroll a...@network-geographics.com
Committed: Mon Aug 26 14:12:15 2013 -0500

--
 doc/glossary.en.rst| 36 ++
 doc/index.rst  | 27 ++---
 doc/reference/api/TSHttpHookAdd.en.rst | 33 +++-
 doc/reference/api/TSPluginInit.en.rst  |  6 +--
 doc/reference/api/TSTypes.en.rst   | 59 +
 5 files changed, 125 insertions(+), 36 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/216ecdab/doc/glossary.en.rst
--
diff --git a/doc/glossary.en.rst b/doc/glossary.en.rst
new file mode 100644
index 000..d33bf19
--- /dev/null
+++ b/doc/glossary.en.rst
@@ -0,0 +1,36 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   License); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+
+=
+Glossary
+=
+
+.. glossary::
+
+   continuation
+  A callable object that contains state. These are are mechanism used by 
Traffic Server to implement callbacks and
+  continued computations. Continued computations are critical to efficient 
processing of traffic because by avoiding
+  any blocking operations that wait on external events. In any such case a 
continuation is used so that other
+  processing can continue until the external event occurs. At that point 
the continuation is invoked to continue the
+  suspended processing. This can be considered similar to co-routines.
+
+   session
+  A single connection from a client to Traffic Server, covering all 
requests and responses on that connection.
+
+   transaction
+  A client request and response, either from the origin server or from the 
cache.
+

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/216ecdab/doc/index.rst
--
diff --git a/doc/index.rst b/doc/index.rst
index a665ea1..aed32f0 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -3,20 +3,20 @@ Apache Traffic Server
 
 .. Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  License); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
- 
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   License); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
 
 
 Apache Traffic Serverâ¢ speeds Internet access, enhances website
@@ -44,6 +44,7 @@ bandwidth.
   reference/plugins/index.en

[28/50] git commit: doc: fix logbuild links

2013-08-30 Thread zwoop

doc: fix logbuild links


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

Branch: refs/heads/5.0.x
Commit: 68d5b163a89adb6efbae19130affac513c46
Parents: af4fc8e
Author: James Peach jpe...@apache.org
Authored: Mon Aug 26 13:31:34 2013 -0700
Committer: James Peach jpe...@apache.org
Committed: Mon Aug 26 13:31:34 2013 -0700

--
 doc/admin/event-logging-formats.en.rst | 2 +-
 doc/admin/working-log-files.en.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/68d5b163/doc/admin/event-logging-formats.en.rst
--
diff --git a/doc/admin/event-logging-formats.en.rst 
b/doc/admin/event-logging-formats.en.rst
index 08d8272..8c48bd8 100644
--- a/doc/admin/event-logging-formats.en.rst
+++ b/doc/admin/event-logging-formats.en.rst
@@ -21,7 +21,7 @@ Event Logging Formats
 This document provides a reference for all the different logging formats
 Traffic Server supports.
 Rather than just reading about those formats, you may also want to try our
-`online event log builder /logbuilder/`_ for an interactive way of
+`online event log builder http://trafficserver.apache.org/logbuilder/`_ for 
an interactive way of
 building and understanding log formats.
 
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/68d5b163/doc/admin/working-log-files.en.rst
--
diff --git a/doc/admin/working-log-files.en.rst 
b/doc/admin/working-log-files.en.rst
index 6ec5aa9..1da9284 100644
--- a/doc/admin/working-log-files.en.rst
+++ b/doc/admin/working-log-files.en.rst
@@ -904,6 +904,6 @@ Online Event Log XML Builder
 
 
 If you need any assistance building your event log, you can try out our
-`online log builder /logbuilder/`_. This is a work in progress, so any
+`online log builder http://trafficserver.apache.org/logbuilder/`_. This is a 
work in progress, so any
 comments, critique or suggestions are most welcome.

[50/50] git commit: Merge branch 'master' into 5.0.x

2013-08-30 Thread zwoop

Merge branch 'master' into 5.0.x

* master: (53 commits)
  Moved the two 4.0.1 changes that we respun build for.
  Added TS-2163
  TS-2163 Remove obsolete WDA and ACC alarms feature
  ci: move jenkins jobs to the jenkins subdirectory
  ci: toggle --enable-wccp correctly for different platforms
  Doc: Add lifecycle hook documentation.
  TS-2145: Add metrics for log collation
  fixed some spelling mistakes in the api header
  TS-2162: Auto-created collation LogObject would be misused by access log
  Some indentation and printf cleanup
  TS-2161: TSHttpTxnHookAdd memory Leak
  TS-2156: Fix stats trap in different type of threads
  doc: move cache glossary into the main glossary
  TS-2160: Update CHANGES.
  TS-2160: Remove ats_is_ip_nonroutable.
  TS-2160: Remove use of ats_is_ip_nonroutable and replace with 
ats_is_ip_linklocal and ats_is_ip_private.
  TS-2160: Add ats_is_ip_private and ats_is_ip_linklocal functions.
  TS-2154: Lua plugin asserts traffic_server on startup
  ci: make git scm polling less aggresive
  ci: flip the 3.4.x branch to 4.0.x
  ...


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

Branch: refs/heads/5.0.x
Commit: a75ebb6372c7e64c415d6fb29d8d24038ee79525
Parents: 812b668 68892bc
Author: Leif Hedstrom zw...@apache.org
Authored: Fri Aug 30 09:19:42 2013 -0700
Committer: Leif Hedstrom zw...@apache.org
Committed: Fri Aug 30 09:19:42 2013 -0700

--
 CHANGES |  44 +-
 Makefile.am |   2 +-
 STATUS  |  24 +-
 build/tcl.m4|   2 +-
 build/xml.m4|   2 +-
 ci/Makefile |  21 -
 ci/apache-rat-0.11-SNAPSHOT.jar | Bin 0 - 1414641 bytes
 ci/coverity-model.cc|  18 +
 ci/jenkins.yaml | 486 -
 ci/jenkins/Makefile |  21 +
 ci/jenkins/jobs.yaml| 524 +++
 ci/jenkins/records.config   |   1 +
 ci/rat-regex.txt|  39 ++
 configure.ac|   5 +-
 doc/admin/event-logging-formats.en.rst  | 121 +++--
 doc/admin/faqs.en.rst   |  69 ++-
 doc/admin/getting-started.en.rst|  31 +-
 doc/admin/traffic-server-error-messages.en.rst  | 406 +++---
 doc/admin/transparent-proxy/bridge.en.rst   | 111 ++--
 doc/admin/working-log-files.en.rst  | 342 ++--
 doc/admin/working-log-files/log-formats.en.rst  |  31 +-
 doc/arch/cache/cache-api.en.rst |  17 +
 doc/arch/cache/cache-appendix.en.rst|  17 +
 doc/arch/cache/cache-glossary.en.rst|  22 -
 doc/arch/cache/cache.en.rst |   2 -
 doc/arch/cache/common.defs  |  17 +
 doc/arch/cache/tier-storage.en.rst  |  17 +
 doc/conf.py |   4 +-
 doc/ext/traffic-server.py   |  20 +-
 doc/glossary.en.rst |  55 ++
 doc/index.rst   |  27 +-
 doc/reference/api/TSHttpHookAdd.en.rst  |  49 +-
 doc/reference/api/TSHttpTxnMilestoneGet.en.rst  | 102 ++--
 doc/reference/api/TSLifecycleHookAdd.en.rst | 103 
 doc/reference/api/TSPluginInit.en.rst   |   6 +-
 doc/reference/api/TSTypes.en.rst|  63 +++
 doc/reference/api/index.en.rst  |  32 +-
 .../configuration/logs_xml.config.en.rst| 102 ++--
 .../configuration/records.config.en.rst |  24 +-
 iocore/cache/Notes  |  18 +
 iocore/dns/P_DNSConnection.h|  19 -
 iocore/eventsystem/I_EventProcessor.h   |   2 +-
 iocore/eventsystem/P_UnixEventProcessor.h   |   2 +-
 iocore/eventsystem/UnixEventProcessor.cc|   6 +-
 iocore/net/P_Connection.h   |  22 -
 iocore/utils/Machine.cc |  10 +-
 lib/perl/lib/Apache/TS/AdminClient.pm   |   1 +
 lib/records/I_RecSignals.h  |   3 -
 lib/records/RecProcess.cc   |  33 ++
 lib/ts/Allocator.h  |   6 +-
 lib/ts/EventNotify.cc   |  39 +-
 lib/ts/EventNotify.h|  13 +-
 lib/ts/ink_inet.cc  |  10 +-
 lib/ts/ink_inet.h   |  53 +-
 mgmt/Alarms.cc  |  40 +-
 mgmt/Alarms.h

1 2 3 4 5 6 7 8 9 10 >

1 - 100 of 7640 matches

Mail list logo