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/9e06528c Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/9e06528c Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/9e06528c Branch: refs/heads/master Commit: 9e06528ce14803821b921c1134ecb4a54c9e5176 Parents: 29f3a12 fb46319 Author: Miles Libbey <mlib...@apache.org> Authored: Tue Dec 17 10:50:06 2013 -0800 Committer: Miles Libbey <mlib...@apache.org> Committed: Tue Dec 17 10:50:06 2013 -0800 ---------------------------------------------------------------------- CHANGES | 9 + ci/tsqa/functions | 244 +++++++++++++++++++ ci/tsqa/test-bootstrap | 41 ++++ ci/tsqa/test-log-configuration | 63 +++++ doc/admin/reverse-proxy-http-redirects.en.rst | 2 +- doc/admin/security-options.en.rst | 4 +- .../configuration/congestion.config.en.rst | 2 +- .../configuration/plugin.config.en.rst | 52 ++-- .../configuration/records.config.en.rst | 10 +- .../configuration/ssl_multicert.config.en.rst | 2 +- .../configuration/storage.config.en.rst | 2 +- doc/reference/plugins/cacheurl.en.rst | 3 +- doc/reference/plugins/combo_handler.en.rst | 4 +- doc/reference/plugins/gzip.en.rst | 3 +- doc/reference/plugins/header_filter.en.rst | 3 +- iocore/aio/AIO.cc | 1 + iocore/net/P_SSLUtils.h | 9 + iocore/net/SSLConfig.cc | 6 + mgmt/RecordsConfig.cc | 4 + plugins/experimental/ts_lua/Makefile.am | 2 +- .../experimental/ts_lua/ts_lua_client_request.c | 45 +++- plugins/experimental/ts_lua/ts_lua_remap.c | 67 +++++ plugins/experimental/ts_lua/ts_lua_remap.h | 28 +++ plugins/experimental/ts_lua/ts_lua_util.c | 3 + proxy/Main.cc | 6 +- proxy/Main.h | 1 - proxy/Plugin.cc | 14 +- proxy/http/HttpSM.cc | 2 +- proxy/http/HttpTransact.cc | 26 +- proxy/logging/LogStandalone.cc | 14 +- tools/tsxs.in | 5 + 31 files changed, 608 insertions(+), 69 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9e06528c/doc/reference/configuration/records.config.en.rst ----------------------------------------------------------------------
