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/03 18:19:21 UTC
[50/50] 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/a44a12ab
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/a44a12ab
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/a44a12ab
Branch: refs/heads/5.0.x
Commit: a44a12ab390ccef595aec435c663136571cf78ca
Parents: 93e7027 17f0102
Author: Leif Hedstrom <zw...@apache.org>
Authored: Fri Jan 3 10:17:16 2014 -0700
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Fri Jan 3 10:17:16 2014 -0700
----------------------------------------------------------------------
CHANGES | 150 +++++--
build/xml.m4 | 2 +-
ci/tsqa/functions | 244 ++++++++++
ci/tsqa/test-bootstrap | 41 ++
ci/tsqa/test-log-configuration | 63 +++
cmd/traffic_cop/traffic_cop.cc | 62 +--
cmd/traffic_shell/traffic_shell.cc | 2 +
configure.ac | 10 +-
doc/admin/configuring-cache.en.rst | 10 +-
doc/admin/faqs.en.rst | 2 +-
doc/admin/reverse-proxy-http-redirects.en.rst | 2 +-
doc/admin/security-options.en.rst | 4 +-
doc/arch/cache/cache-arch.en.rst | 148 +++---
doc/arch/cache/ram-cache.en.rst | 88 ++++
doc/glossary.en.rst | 42 +-
doc/reference/commands/traffic_server.en.rst | 2 +-
doc/reference/commands/traffic_top.en.rst | 4 +-
doc/reference/configuration/cache.config.en.rst | 38 +-
.../configuration/congestion.config.en.rst | 2 +-
.../configuration/logs_xml.config.en.rst | 16 +-
.../configuration/plugin.config.en.rst | 54 ++-
.../configuration/records.config.en.rst | 85 +++-
doc/reference/configuration/remap.config.en.rst | 88 +++-
.../configuration/ssl_multicert.config.en.rst | 2 +-
.../configuration/storage.config.en.rst | 2 +-
doc/reference/plugins/balancer.en.rst | 117 +++--
doc/reference/plugins/buffer_upload.en.rst | 93 ++--
doc/reference/plugins/cacheurl.en.rst | 3 +-
doc/reference/plugins/combo_handler.en.rst | 5 +-
doc/reference/plugins/gzip.en.rst | 3 +-
doc/reference/plugins/header_filter.en.rst | 3 +-
doc/reference/plugins/header_rewrite.en.rst | 174 ++++++++
doc/reference/plugins/hipes.en.rst | 74 ++-
doc/reference/plugins/index.en.rst | 1 -
doc/reference/plugins/ts_lua.en.rst | 3 +-
...viewing-statistics-using-traffic-line.en.rst | 2 +-
doc/sdk/mutex-guide.en.rst | 2 +-
example/protocol/Protocol.c | 12 +-
iocore/aio/AIO.cc | 6 +-
iocore/aio/test_AIO.cc | 8 +
iocore/eventsystem/I_SocketManager.h | 3 +-
iocore/net/I_Net.h | 8 -
iocore/net/Net.cc | 2 +-
iocore/net/P_Connection.h | 1 +
iocore/net/P_SSLUtils.h | 9 +
iocore/net/P_UnixPollDescriptor.h | 4 +
iocore/net/SSLConfig.cc | 6 +
iocore/net/SSLUtils.cc | 21 +-
iocore/net/UnixConnection.cc | 10 +-
iocore/net/UnixNet.cc | 7 +-
iocore/net/UnixUDPNet.cc | 6 +-
lib/atscppapi/src/include/atscppapi/Headers.h | 2 +-
lib/records/I_RecCore.h | 8 +-
lib/records/RecCore.cc | 7 +-
lib/records/RecMessage.cc | 3 +-
lib/ts/ink_atomic.h | 39 +-
lib/ts/ink_inet.cc | 2 +-
lib/ts/ink_queue_ext.cc | 5 +-
mgmt/LocalManager.cc | 3 +-
mgmt/Main.cc | 5 +-
mgmt/RecordsConfig.cc | 12 +
mgmt/api/CoreAPIRemote.cc | 2 +
plugins/experimental/Makefile.am | 2 +
plugins/experimental/balancer/Makefile.am | 22 +
plugins/experimental/balancer/README | 93 ----
plugins/experimental/balancer/balancer.cc | 446 ++++---------------
plugins/experimental/balancer/balancer.h | 46 ++
plugins/experimental/balancer/hash.cc | 207 +++++++++
plugins/experimental/balancer/hashkey.h | 254 -----------
plugins/experimental/balancer/resources.h | 111 -----
plugins/experimental/balancer/roundrobin.cc | 72 +++
plugins/experimental/hipes/Makefile.am | 22 +
plugins/experimental/hipes/hipes.cc | 285 ++++++------
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/ICP.cc | 22 +-
proxy/ICP.h | 1 +
proxy/ICPConfig.cc | 7 +
proxy/InkAPI.cc | 6 +-
proxy/Main.cc | 22 +-
proxy/Main.h | 1 -
proxy/Plugin.cc | 14 +-
proxy/hdrs/HTTP.cc | 9 +-
proxy/http/HttpSM.cc | 6 +-
proxy/http/HttpTransact.cc | 30 +-
proxy/http/HttpTransactHeaders.cc | 70 ---
proxy/http/HttpTransactHeaders.h | 6 -
proxy/http/HttpTunnel.cc | 5 +-
proxy/logging/Log.h | 2 +-
proxy/logging/LogFile.h | 2 +-
proxy/logging/LogHost.cc | 3 +-
proxy/logging/LogHost.h | 2 +-
proxy/logging/LogObject.cc | 10 +-
proxy/logging/LogObject.h | 2 +-
proxy/logging/LogStandalone.cc | 14 +-
tools/tsxs.in | 5 +
99 files changed, 2301 insertions(+), 1477 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a44a12ab/CHANGES
----------------------------------------------------------------------
diff --cc CHANGES
index c6dfb60,2a0771c..75890e1
--- a/CHANGES
+++ b/CHANGES
@@@ -1,12 -1,65 +1,70 @@@
-*- coding: utf-8 -*-
-Changes with Apache Traffic Server 4.2.0
+Changes with Apache Traffic Server 5.0.0
+
+ *) [TS-1919] Eliminate CacheLookupHttpConfig. This breaks cluster
+ compatibility, so all cluster nodes should be upgraded simultaneously.
+ *) [TS-2467] traffic_shell doesn't work with tcl 8.6.
+ Author: Ben Aitchison <be...@meh.net.nz>
+
+ *) [TS-1365] Add a new configuration option, proxy.config.net.poll_timeout,
+ with the same behavior as the command line option --poll_timeout. Also
+ adjust AIO scheduling to correlate to this setting, to avoid additional
+ CPU load. Note that this configuration is generally not necessary to
+ configure, unless you are concerned with system idle CPU consumption.
+
+ *) [TS-2468] Bring back the load balancer plugin.
+
+ *) [TS-2465] libxml2 detection generates an invalid linker path.
+ Author: Radim Kolar <hs...@sendmail.cz>
+
+ *) [TS-2271] Threaded plugin support with 3rd party libraries.
+ Author: Heikki Hannikainen <he...@hes.iki.fi>
+
+ *) [TS-2464] Remove useless and buggy connection header handling
+
+ *) [TS-2457] Protocol.c: change usage of atoi to strtol.
+ Author: Radim Kolar <hs...@sendmail.cz>
+
+ *) [TS-2459] Fix wrong name for a couple of librecord APIs.
+ Author: Yu Qing <ha...@yahoo.com.cn>
+
+ *) [TS-2463] Crash regression around slow-log feature, when logging an
+ event. This fixes commit c290ce0df2a.
+
+ *) [TS-32] Fix ICP. Author: Gota Adachi <ad...@iij.ad.jp>
+
+ *) [TS-2248] Segmentation fault in HttpTunnel with flow control.
+ Author: bettydramit <b1...@gmail.com>
+
+ *) [TS-2454] Fix undefined reference to `__sync_fetch_and_sub_8' on ARM
+ 32bit system.
+
+ *) [TS-2450] Fix assertion failure for T61String type.
+
+ *) [TS-2117] make hipes plugin build.
+
+ *) [TS-2452] Can't access a deleted object.
+
+ *) [TS-2363] Fix assertion of "Unknown file format type!".
+
+ *) [TS-2448] Fix traffic_cop and traffic_manager to obey the
+ proxy.config.local_state_dir setting.
+
+ *) [TS-2445] Fix problem with 204 responses closing POST requests.
+
+ *) [TS-2434] Use the FATAL error level to handle plugin errors.
+
+ *) [TS-2203] Clarify syslog startup messages for standalone log programs.
+
+ *) [TS-2436] Add a simple integration test harness.
+
+ *) [TS-2355] ATS 4.0.x crashes when using OpenSSL 1.0.1e.
+
+ *) [TS-2432] Fix a race in aio_err_callblk.
+Changes with Apache Traffic Server 4.2.0
+
*) [TS-2251] Simplify LogBuffer reference counting.
*) [TS-2190] Remove cache.log from the cachurl plugin.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a44a12ab/proxy/ICP.cc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a44a12ab/proxy/http/HttpSM.cc
----------------------------------------------------------------------