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/cf03ec12 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/cf03ec12 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/cf03ec12 Branch: refs/heads/master Commit: cf03ec1228ddac3943f2de603d7846f1ad6c48e7 Parents: 8e11d38 128c645 Author: Miles Libbey <[email protected]> Authored: Tue Sep 24 13:06:48 2013 -0700 Committer: Miles Libbey <[email protected]> Committed: Tue Sep 24 13:06:48 2013 -0700 ---------------------------------------------------------------------- CHANGES | 95 ++- Makefile.am | 2 +- STATUS | 24 +- Vagrantfile | 7 +- build/tcl.m4 | 2 +- build/xml.m4 | 81 +- 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 | 781 +++++++++++++++++++ ci/jenkins/records.config | 1 + ci/rat-regex.txt | 39 + configure.ac | 6 +- contrib/manifests/debian.pp | 9 + contrib/manifests/redhat.pp | 2 +- doc/admin/configuring-cache.en.rst | 48 +- doc/admin/event-logging-formats.en.rst | 123 ++- doc/admin/faqs.en.rst | 174 ++--- doc/admin/getting-started.en.rst | 31 +- doc/admin/http-proxy-caching.en.rst | 80 +- doc/admin/traffic-server-error-messages.en.rst | 471 ++++++----- doc/admin/transparent-proxy/bridge.en.rst | 111 +-- doc/admin/working-log-files.en.rst | 391 +++++----- doc/admin/working-log-files/log-formats.en.rst | 35 +- 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 | 60 ++ doc/index.rst | 27 +- doc/reference/api/TSHttpHookAdd.en.rst | 49 +- .../api/TSHttpOverridableConfig.en.rst | 70 ++ doc/reference/api/TSHttpTxnMilestoneGet.en.rst | 102 +-- doc/reference/api/TSLifecycleHookAdd.en.rst | 109 +++ doc/reference/api/TSPluginInit.en.rst | 6 +- doc/reference/api/TSTypes.en.rst | 77 ++ doc/reference/api/index.en.rst | 33 +- doc/reference/commands/traffic_cop.en.rst | 28 +- .../configuration/logs_xml.config.en.rst | 104 +-- .../configuration/records.config.en.rst | 271 +++++-- .../configuration/storage.config.en.rst | 37 +- doc/sdk/getting-started.en.rst | 2 + doc/sdk/header-based-plugin-examples.en.rst | 2 + .../how-to-create-trafficserver-plugins.en.rst | 2 + doc/sdk/http-transformation-plugin.en.rst | 8 +- doc/sdk/index.en.rst | 4 + doc/sdk/new-protocol-plugins.en.rst | 65 +- doc/sdk/preface.en.rst | 16 +- iocore/cache/CacheWrite.cc | 1 + iocore/cache/Notes | 18 + iocore/dns/P_DNSConnection.h | 19 - iocore/eventsystem/I_EventProcessor.h | 2 +- iocore/eventsystem/P_UnixEventProcessor.h | 2 +- iocore/eventsystem/UnixEThread.cc | 4 + iocore/eventsystem/UnixEventProcessor.cc | 6 +- iocore/net/P_Connection.h | 22 - iocore/net/UnixNet.cc | 5 + iocore/utils/Machine.cc | 10 +- lib/perl/Makefile.am | 7 +- 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 | 83 +- lib/ts/EventNotify.h | 15 +- lib/ts/ink_inet.cc | 10 +- lib/ts/ink_inet.h | 53 +- lib/ts/ink_lockfile.h | 4 - lib/tsconfig/Makefile.am | 2 +- mgmt/Alarms.cc | 40 +- mgmt/Alarms.h | 2 +- mgmt/BaseManager.h | 3 - mgmt/LocalManager.cc | 4 - mgmt/RecordsConfig.cc | 126 ++- mgmt/cluster/ClusterCom.cc | 119 ++- mgmt/cluster/ClusterCom.h | 2 + mgmt/stats/StatProcessor.cc | 30 +- mgmt/stats/StatProcessor.h | 8 + mgmt/stats/StatType.cc | 24 + mgmt/stats/spec | 18 + mgmt/utils/XmlUtils.cc | 61 +- plugins/experimental/Makefile.am | 1 + plugins/experimental/buffer_upload/Makefile.am | 21 + .../experimental/buffer_upload/buffer_upload.cc | 58 +- plugins/experimental/healthchecks/README | 4 +- .../experimental/healthchecks/healthchecks.c | 46 +- plugins/experimental/lua/state.cc | 5 + plugins/experimental/rfc5861/rfc5861.c | 1 + plugins/header_rewrite/Examples/Force-close | 2 +- plugins/header_rewrite/README | 88 ++- plugins/header_rewrite/header_rewrite.config | 94 --- plugins/regex_remap/README | 12 +- plugins/regex_remap/regex_remap.cc | 30 +- proxy/InkAPI.cc | 15 +- proxy/InkAPIInternal.h | 97 ++- proxy/Main.cc | 12 +- proxy/Main.h | 1 - proxy/Makefile.am | 4 +- proxy/StatSystem.h | 8 + proxy/api/ts/experimental.h | 7 +- proxy/api/ts/ts.h.in | 18 +- proxy/config/records.config.default.in | 30 +- proxy/config/stats.config.xml.default | 156 ++++ proxy/example_alarm_bin.sh | 50 +- proxy/http/HttpDebugNames.cc | 4 +- proxy/http/HttpSM.cc | 104 ++- proxy/http/HttpSM.h | 2 +- proxy/http/HttpTransact.cc | 74 +- proxy/http/HttpTransact.h | 26 +- proxy/http/HttpTunnel.cc | 2 +- proxy/http/HttpUpdateSM.cc | 2 +- proxy/logging/Log.cc | 104 ++- proxy/logging/Log.h | 9 +- proxy/logging/LogAccess.cc | 4 +- proxy/logging/LogCollationClientSM.cc | 6 + proxy/logging/LogCollationHostSM.cc | 11 +- proxy/logging/LogConfig.cc | 319 ++++---- proxy/logging/LogConfig.h | 65 +- proxy/logging/LogFile.cc | 42 +- proxy/logging/LogFilter.cc | 7 +- proxy/logging/LogHost.cc | 8 + proxy/logging/LogObject.cc | 70 +- proxy/logging/LogObject.h | 13 +- proxy/msgs/TSMessages.mc | 83 -- proxy/msgs/TSMsgs.rc | 39 - rc/trafficserver.in | 12 +- tools/apichecker.pl | 179 ++++- tools/jtest/jtest.cc | 1 - 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 + 147 files changed, 4708 insertions(+), 2449 deletions(-) ----------------------------------------------------------------------
