You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2014/01/31 00:31:25 UTC

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

Merge branch 'master' into 5.0.x


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

Branch: refs/heads/5.0.x
Commit: 3a1fcd475c27b052bf7ff439c3545b20a53d93de
Parents: 10dc9f7 4b6f7ae
Author: Leif Hedstrom <zw...@apache.org>
Authored: Thu Jan 30 16:31:01 2014 -0700
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Thu Jan 30 16:31:01 2014 -0700

----------------------------------------------------------------------
 CHANGES                                         |  15 ++
 cmd/traffic_line/traffic_line.cc                |  91 ++++++++
 doc/reference/commands/traffic_line.en.rst      |  15 ++
 doc/reference/plugins/header_rewrite.en.rst     |  66 +++---
 doc/reference/plugins/index.en.rst              |   1 +
 iocore/net/SSLCertLookup.cc                     |  30 ++-
 iocore/net/SSLUtils.cc                          |   4 +-
 iocore/net/test_certlookup.cc                   |  13 +-
 iocore/utils/Machine.cc                         |  20 +-
 lib/perl/Makefile.am                            |   2 +-
 plugins/conf_remap/conf_remap.cc                |  31 +--
 .../experimental/healthchecks/healthchecks.c    |   6 +-
 plugins/header_rewrite/Makefile.am              |   3 +-
 plugins/header_rewrite/README                   | 230 +------------------
 plugins/header_rewrite/condition.h              |   4 +-
 plugins/header_rewrite/expander.cc              | 138 +++++++++++
 plugins/header_rewrite/expander.h               |  49 ++++
 plugins/header_rewrite/operator.h               | 138 -----------
 plugins/header_rewrite/operators.cc             |   8 +-
 plugins/header_rewrite/value.h                  |  13 +-
 20 files changed, 439 insertions(+), 438 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3a1fcd47/CHANGES
----------------------------------------------------------------------
diff --cc CHANGES
index 34b2940,33ba8ee..2ffd565
--- a/CHANGES
+++ b/CHANGES
@@@ -1,12 -1,21 +1,27 @@@
                                                           -*- coding: utf-8 -*-
 +Changes with Apache Traffic Server 5.0.0
 +
 +  *) [TS-2290] Remove X-ID special log tag, and cleanup HdrToken confusion.
 +
 +  *) [TS-2088] Change TSRecordType enum values to powers of two
 +
  Changes with Apache Traffic Server 4.2.0
  
+   *) [TS-2544] conf_remap plugin: allow for multiple configuration files.
+ 
+   *) [TS-2530] Check for loopback interfaces when computing the local address.
+    Author: Ron Barber rbarber@yahoo-inc.com
+ 
+   *) [TS-2031] Prevent duplicate SSL SNI name registration.
+    Author: Feifei Cai <ff...@yahoo-inc.com>
+ 
+   *) [TS-2501] Refactor and improve performance for the case without
+    expansions. Review: Alexey Ivanov <ai...@linkedin.com>.
+ 
+   *) [TS-2533 ] Add three commands previously provided by traffic_shell.
+ 
+   *) [TS-2304] Make the healthcheck plugin watch for file permission changes.
+ 
    *) [TS-2519] Make build version metrics non-persistent.
  
    *) [TS-1606] Log buffers are not flushed periodically when TS is launched