Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/ce74235e Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/ce74235e Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/ce74235e Branch: refs/heads/master Commit: ce74235e3c2b8c7ac88bc9c3c6c19ce359885f68 Parents: 1c1a72a 2dbdd9c Author: Brian Geffon <bri...@apache.org> Authored: Mon Feb 9 16:22:14 2015 -0800 Committer: Brian Geffon <bri...@apache.org> Committed: Mon Feb 9 16:22:14 2015 -0800 ---------------------------------------------------------------------- CHANGES | 7 ++ build/crypto.m4 | 83 +++++++++++++++++++++++- ci/new_tsqa/tests/helpers.py | 2 +- cmd/traffic_cop/Makefile.am | 9 ++- cmd/traffic_crashlog/Makefile.am | 9 +-- cmd/traffic_layout/Makefile.am | 5 ++ cmd/traffic_line/Makefile.am | 8 ++- cmd/traffic_manager/Makefile.am | 10 +-- cmd/traffic_top/Makefile.am | 11 +++- cmd/traffic_via/Makefile.am | 6 +- cmd/traffic_wccp/Makefile.am | 17 +++-- configure.ac | 18 +++-- doc/admin/event-logging-formats.en.rst | 22 +++++++ iocore/aio/Makefile.am | 15 +++-- iocore/cache/Cache.cc | 2 +- iocore/cache/CacheDir.cc | 2 +- iocore/eventsystem/Makefile.am | 28 ++++---- iocore/net/Makefile.am | 15 +++-- iocore/net/P_SSLConfig.h | 4 +- iocore/net/SSLConfig.cc | 10 ++- iocore/net/SSLInternal.cc | 7 ++ iocore/net/SSLNetProcessor.cc | 2 +- iocore/net/SSLUtils.cc | 4 +- lib/ts/ink_config.h.in | 2 + mgmt/Makefile.am | 6 +- mgmt/utils/Makefile.am | 12 ++-- mgmt/web2/WebUtils.cc | 2 +- plugins/experimental/esi/lib/FailureInfo.cc | 1 + proxy/Main.cc | 68 ++++++++++++++++++- proxy/Makefile.am | 44 +++++-------- proxy/Plugin.cc | 26 +++++--- proxy/Plugin.h | 2 +- proxy/ReverseProxy.cc | 6 +- proxy/ReverseProxy.h | 2 +- proxy/http/HttpProxyServerMain.cc | 10 +-- 35 files changed, 357 insertions(+), 120 deletions(-) ----------------------------------------------------------------------