Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver into apache
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/0b9ea012 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/0b9ea012 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/0b9ea012 Branch: refs/heads/master Commit: 0b9ea012c6241c1c7b64523889517a39b70fab40 Parents: 94a61e6 b616e28 Author: John Plevyak <[email protected]> Authored: Wed Dec 16 16:28:00 2015 -0800 Committer: John Plevyak <[email protected]> Committed: Wed Dec 16 16:28:00 2015 -0800 ---------------------------------------------------------------------- ci/tsqa/tests/test_https.py | 68 +- configure.ac | 1 + doc/admin-guide/plugins/cachekey.en.rst | 361 +++++++++++ doc/admin-guide/plugins/index.en.rst | 1 + iocore/net/P_SSLConfig.h | 2 + iocore/net/SSLConfig.cc | 1 + iocore/net/SSLUtils.cc | 4 + mgmt/BaseManager.h | 4 +- mgmt/FileManager.cc | 88 ++- mgmt/FileManager.h | 17 +- mgmt/LocalManager.cc | 15 + mgmt/ProcessManager.cc | 14 + mgmt/ProcessManager.h | 1 + mgmt/ProxyConfig.h | 4 + mgmt/Rollback.cc | 49 +- mgmt/Rollback.h | 35 +- plugins/experimental/Makefile.am | 1 + plugins/experimental/cachekey/Makefile.am | 25 + plugins/experimental/cachekey/README.md | 13 + plugins/experimental/cachekey/cachekey.cc | 519 +++++++++++++++ plugins/experimental/cachekey/cachekey.h | 81 +++ plugins/experimental/cachekey/common.cc | 38 ++ plugins/experimental/cachekey/common.h | 62 ++ plugins/experimental/cachekey/configs.cc | 428 +++++++++++++ plugins/experimental/cachekey/configs.h | 161 +++++ plugins/experimental/cachekey/pattern.cc | 505 +++++++++++++++ plugins/experimental/cachekey/pattern.h | 137 ++++ plugins/experimental/cachekey/plugin.cc | 130 ++++ .../experimental/cachekey/tests/pattern_test.cc | 66 ++ .../cachekey/tests/test_cachekey.py | 636 +++++++++++++++++++ proxy/Main.cc | 8 + proxy/ParentSelection.cc | 2 +- proxy/http/HttpSM.cc | 2 +- proxy/http2/HuffmanCodec.cc | 4 +- proxy/http2/test_Huffmancode.cc | 2 + 35 files changed, 3432 insertions(+), 53 deletions(-) ----------------------------------------------------------------------
