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 2013/12/14 22:51:58 UTC
[49/50] git commit: Merge branch 'master' into 5.0.x
Merge branch 'master' into 5.0.x
Conflicts:
CHANGES
iocore/cache/CacheRead.cc
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/d6a7a9c4
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/d6a7a9c4
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/d6a7a9c4
Branch: refs/heads/5.0.x
Commit: d6a7a9c4efeb0f85509b633a14acd896dc8eb3e4
Parents: c63666b 3388fd8
Author: Leif Hedstrom <zw...@apache.org>
Authored: Sat Dec 14 14:44:55 2013 -0700
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Sat Dec 14 14:44:55 2013 -0700
----------------------------------------------------------------------
.gitattributes | 1 -
CHANGES | 70 +
Makefile.am | 6 +-
build/crypto.m4 | 48 +
ci/jenkins/git-jenkins-setup.sh | 55 +
ci/jenkins/git-jenkins-update.sh | 44 +
ci/jenkins/jobs.yaml | 8 +-
ci/jenkins/records.config | 3 -
ci/regression | 1 +
cmd/traffic_cop/traffic_cop.cc | 18 +-
cmd/traffic_top/stats.h | 4 +-
configure.ac | 72 +-
doc/Makefile.am | 19 +-
doc/admin/event-logging-formats.en.rst | 3 +
doc/admin/faqs.en.rst | 2 +-
doc/admin/index.en.rst | 8 +
doc/admin/performance-tuning.en.rst | 54 +
doc/arch/cache/cache-appendix.en.rst | 6 +-
doc/arch/cache/tier-storage.en.rst | 2 +-
doc/arch/index.en.rst | 1 +
doc/conf.py | 44 +-
doc/reference/api/TSUrlCreate.en.rst | 144 +-
doc/reference/api/TSUrlHostGet.en.rst | 79 +
doc/reference/api/TSUrlHostSet.en.rst | 74 +
doc/reference/api/TSUrlPercentEncode.en.rst | 67 +
doc/reference/api/TSUrlStringGet.en.rst | 67 +
doc/reference/api/index.en.rst | 4 +
doc/reference/commands/traffic_server.en.rst | 2 -
.../configuration/records.config.en.rst | 108 +-
doc/reference/configuration/remap.config.en.rst | 53 +-
.../configuration/ssl_multicert.config.en.rst | 57 +-
.../configuration/storage.config.en.rst | 5 +
doc/reference/plugins/balancer.en.rst | 18 +-
doc/reference/plugins/cacheurl.en.rst | 30 +-
doc/reference/plugins/index.en.rst | 6 +-
doc/reference/plugins/regex_remap.en.rst | 27 +-
doc/reference/plugins/ts_lua.en.rst | 584 ++++
doc/reference/plugins/xdebug.en.rst | 45 +
doc/sdk/http-hooks-and-transactions.en.rst | 85 +-
.../adding-hooks.en.rst | 14 +-
...e-buffered-null-transformation-plugin.en.rst | 10 +-
.../unable-to-debug-tags.en.rst | 4 +-
example/app-template/app-template.cc | 19 +-
iocore/Makefile.am | 7 +-
iocore/aio/AIO.cc | 2 +-
iocore/aio/Makefile.am | 1 -
iocore/cache/Cache.cc | 73 +-
iocore/cache/CacheHosting.cc | 42 +-
iocore/cache/CacheHttp.cc | 16 +-
iocore/cache/CachePages.cc | 2 -
iocore/cache/CachePagesInternal.cc | 4 -
iocore/cache/CacheRead.cc | 21 +-
iocore/cache/CacheWrite.cc | 4 +
iocore/cache/I_CacheDefs.h | 2 +-
iocore/cache/Makefile.am | 12 -
iocore/cache/Notes | 3 -
iocore/cache/P_CacheHosting.h | 5 +-
iocore/cache/P_CacheInternal.h | 12 +-
iocore/cache/Store.cc | 12 +-
iocore/cluster/ClusterAPI.cc | 7 -
iocore/cluster/ClusterHandlerBase.cc | 5 +-
iocore/cluster/ClusterMachine.cc | 12 +-
iocore/cluster/ClusterProcessor.cc | 2 -
iocore/cluster/Makefile.am | 2 -
iocore/cluster/P_ClusterCache.h | 2 -
iocore/cluster/P_ClusterInternal.h | 2 -
iocore/dns/DNS.cc | 1 -
iocore/dns/Makefile.am | 9 -
iocore/dns/P_DNSProcessor.h | 26 +
iocore/dns/P_SplitDNSProcessor.h | 27 -
iocore/eventsystem/Makefile.am | 1 -
iocore/hostdb/HostDB.cc | 65 +-
iocore/hostdb/Makefile.am | 10 -
iocore/hostdb/MultiCache.cc | 11 +-
iocore/net/I_Socks.h | 3 +-
iocore/net/Makefile.am | 10 +-
iocore/net/P_NetAccept.h | 2 +-
iocore/net/P_SSLConfig.h | 3 +
iocore/net/P_SSLUtils.h | 3 +
iocore/net/SSLCertLookup.cc | 2 +-
iocore/net/SSLConfig.cc | 24 +
iocore/net/SSLNetVConnection.cc | 29 +-
iocore/net/SSLUtils.cc | 254 +-
iocore/net/Socks.cc | 2 +-
iocore/net/UnixNetAccept.cc | 4 +-
iocore/net/UnixNetPages.cc | 4 -
iocore/net/UnixNetProcessor.cc | 13 +-
iocore/net/test_certlookup.cc | 9 +
iocore/utils/Makefile.am | 2 -
lib/perl/lib/Apache/TS/AdminClient.pm | 2 -
lib/records/I_RecCore.h | 17 +
lib/records/I_RecDefs.h | 7 -
lib/records/I_RecProcess.h | 2 +-
lib/records/P_RecCore.h | 2 -
lib/records/RecConfigParse.cc | 1 +
lib/records/RecCore.cc | 87 +-
lib/records/RecDebug.cc | 15 +
lib/records/RecMessage.cc | 6 +-
lib/records/RecProcess.cc | 73 +-
lib/ts/EventNotify.cc | 3 +-
lib/ts/ink_config.h.in | 11 +-
lib/ts/ink_resource.h | 2 +-
mgmt/FileManager.cc | 92 +-
mgmt/FileManager.h | 1 -
mgmt/LocalManager.cc | 23 +-
mgmt/LocalManager.h | 4 +-
mgmt/Main.cc | 49 +-
mgmt/Main.h | 1 -
mgmt/ProcessManager.cc | 6 +-
mgmt/ProcessManager.h | 2 +-
mgmt/RecordsConfig.cc | 17 +-
mgmt/Rollback.cc | 34 +-
mgmt/Rollback.h | 1 -
mgmt/cluster/VMap.cc | 13 +-
mgmt/web2/WebIntrMain.cc | 9 +-
plugins/cacheurl/cacheurl.c | 38 +-
plugins/experimental/Makefile.am | 22 +-
.../experimental/buffer_upload/buffer_upload.cc | 33 +-
plugins/experimental/ts_lua/Makefile.am | 35 +
plugins/experimental/ts_lua/README.md | 546 ++++
.../experimental/ts_lua/business/mediaslice.lua | 155 +
.../experimental/ts_lua/business/sethost.lua | 41 +
plugins/experimental/ts_lua/example/hdr.lua | 37 +
.../ts_lua/example/test_cache_lookup.lua | 44 +
.../ts_lua/example/test_client_socket.lua | 40 +
.../ts_lua/example/test_creq_method.lua | 40 +
.../ts_lua/example/test_creq_uri.lua | 40 +
.../ts_lua/example/test_creq_uri_args.lua | 36 +
.../ts_lua/example/test_intercept.lua | 42 +
.../experimental/ts_lua/example/test_post.lua | 48 +
.../ts_lua/example/test_ret_403.lua | 38 +
.../ts_lua/example/test_server_intercept.lua | 41 +
.../ts_lua/example/test_transform.lua | 49 +
plugins/experimental/ts_lua/ts_lua.c | 148 +
plugins/experimental/ts_lua/ts_lua_atomic.c | 98 +
plugins/experimental/ts_lua/ts_lua_atomic.h | 30 +
.../ts_lua/ts_lua_cached_response.c | 88 +
.../ts_lua/ts_lua_cached_response.h | 28 +
.../experimental/ts_lua/ts_lua_client_request.c | 514 +++
.../experimental/ts_lua/ts_lua_client_request.h | 28 +
.../ts_lua/ts_lua_client_response.c | 198 ++
.../ts_lua/ts_lua_client_response.h | 28 +
plugins/experimental/ts_lua/ts_lua_common.h | 134 +
plugins/experimental/ts_lua/ts_lua_context.c | 94 +
plugins/experimental/ts_lua/ts_lua_context.h | 29 +
plugins/experimental/ts_lua/ts_lua_hook.c | 143 +
plugins/experimental/ts_lua/ts_lua_hook.h | 28 +
plugins/experimental/ts_lua/ts_lua_http.c | 227 ++
plugins/experimental/ts_lua/ts_lua_http.h | 28 +
.../experimental/ts_lua/ts_lua_http_intercept.c | 299 ++
.../experimental/ts_lua/ts_lua_http_intercept.h | 28 +
plugins/experimental/ts_lua/ts_lua_log.c | 117 +
plugins/experimental/ts_lua/ts_lua_log.h | 27 +
plugins/experimental/ts_lua/ts_lua_misc.c | 91 +
plugins/experimental/ts_lua/ts_lua_misc.h | 28 +
.../experimental/ts_lua/ts_lua_server_request.c | 207 ++
.../experimental/ts_lua/ts_lua_server_request.h | 28 +
.../ts_lua/ts_lua_server_response.c | 194 ++
.../ts_lua/ts_lua_server_response.h | 28 +
plugins/experimental/ts_lua/ts_lua_transform.c | 173 +
plugins/experimental/ts_lua/ts_lua_transform.h | 28 +
plugins/experimental/ts_lua/ts_lua_util.c | 451 +++
plugins/experimental/ts_lua/ts_lua_util.h | 45 +
plugins/experimental/xdebug/Makefile.am | 22 +
plugins/experimental/xdebug/xdebug.cc | 217 ++
plugins/header_rewrite/conditions.cc | 4 -
plugins/header_rewrite/operators.cc | 2 +-
proxy/ControlMatcher.cc | 13 +-
proxy/ControlMatcher.h | 5 +-
proxy/ICPConfig.cc | 13 +-
proxy/IPAllow.cc | 13 +-
proxy/IPAllow.h | 1 -
proxy/Initialize.cc | 273 --
proxy/Initialize.h | 57 -
proxy/InkAPI.cc | 7 +-
proxy/InkAPITest.cc | 5 +-
proxy/InkXml.cc | 485 ---
proxy/InkXml.h | 231 --
proxy/Main.cc | 130 +-
proxy/Main.h | 5 +-
proxy/Makefile.am | 48 +-
proxy/MuxVC.cc | 3063 ------------------
proxy/MuxVC.h | 382 ---
proxy/Plugin.cc | 32 +-
proxy/Plugin.h | 3 +-
proxy/Prefetch.cc | 17 +-
proxy/ReverseProxy.cc | 22 +-
proxy/StatSystem.cc | 20 +-
proxy/Update.cc | 10 +-
proxy/config/records.config.default.in | 3 -
proxy/hdrs/HTTP.cc | 17 +-
proxy/hdrs/HTTP.h | 47 +-
proxy/http/HttpBodyFactory.cc | 27 +-
proxy/http/HttpBodyFactory.h | 1 -
proxy/http/HttpConfig.cc | 5 +-
proxy/http/HttpConfig.h | 5 +-
proxy/http/HttpSM.cc | 104 +-
proxy/http/HttpTransact.cc | 93 +-
proxy/http/remap/UrlRewrite.cc | 3 +-
proxy/logcat.cc | 1 -
proxy/logging/LogBuffer.h | 19 +-
proxy/logging/LogConfig.cc | 60 +-
proxy/logging/LogStandalone.cc | 34 +-
proxy/sac.cc | 23 +-
proxy/shared/DiagsConfig.cc | 48 +-
proxy/shared/DiagsConfig.h | 13 +-
proxy/shared/Error.cc | 2 +-
proxy/shared/InkXml.cc | 485 +++
proxy/shared/InkXml.h | 231 ++
proxy/shared/Makefile.am | 17 +-
proxy/shared/UglyLogStubs.cc | 1 +
proxy/shared/signals.cc | 414 +++
proxy/shared/signals.h | 53 +
proxy/signals.cc | 414 ---
proxy/signals.h | 53 -
tools/http_load/http_load.c | 2 +-
216 files changed, 8974 insertions(+), 6408 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d6a7a9c4/CHANGES
----------------------------------------------------------------------
diff --cc CHANGES
index 0882bf2,8a92590..f9672d9
--- a/CHANGES
+++ b/CHANGES
@@@ -1,9 -1,70 +1,73 @@@
-*- 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-2251] Simplify LogBuffer reference counting.
+
+ *) [TS-2190] Remove cache.log from the cachurl plugin.
+
+ *) [TS-2426] Add a new plugin, xdebug, for cache debugging using HTTP headers.
+
+ *) [TS-2077] Remove pipeline configurations, they were no-op's anyways. We
+ still support pipelining (we always do), it's just not treated specially
+ (or optimized).
+
+ *) [TS-2386] clean up unused files and codes -- round 4.2
+
+ *) [TS-548] remove Initialize.cc Initialize.h
+
+ *) [TS-2082] remove STANDALONE_IOCORE FIXME_NONMODULAR and NON_MODULAR defines
+
+ *) [TS-312] Add option to always share keep-alive connections to the origin server
+
+ *) [TS-2419] Don't close client connection when responding with a 204 and there is no body
+
+ *) [TS-1146] Add RFC 5077 TLS session ticket support.
+ Author: Wei Sun <su...@yahoo-inc.com>
+
+ *) [TS-2401] Use Layout instead of global install path directories.
+
+ *) [TS-2420] Remove STAT_SYNC, CONF_SYNC, and REM_SYNC threads and schedule those
+ continuations in ET_TASK
+
+ *) [TS-2372] Enable TLS perfect forward security with ECDHE.
+
+ *) [TS-2416] Make TLS the session timeout threshold configurable.
+ Author: Wei Sun <su...@yahoo-inc.com>
+
+ *) [TS-2335] adding ts_lua plugin to experimental directory
+
+ *) [TS-2347] buffer_upload uses unsafe function tempnam(). Replace it
+ with mkstemp()
+
+ *) [TS-1815] Add thread number and port to accept thread name and
+ add the file descriptor number to the ET_AIO thread names
+
+ *) [TS-2415] Use standard continuations to release UrlRewrite objects.
+
+ *) [TS-2413] Release memory for idle SSL connections.
+ Author: Wei Sun <su...@yahoo-inc.com>
+
+ *) [TS-2365] Configure the maximum TLS record size.
+ Author: Wei Sun <su...@yahoo-inc.com>
+
+ *) [TS-2351] Bandaid fix for Range request crash related to
+ Read-While-Writer and content length calculations.
+
+ *) [TS-2408] Fix double free of proxy.config.admin.user_id.
+
+ *) [TS-2396] UrlRewrite.cc does not free the queue correctly.
+ Author: Yu Qing <zh...@taobao.com>
+
+ *) [TS-2382] Partial fix for make install creating man files as root.
+
+ *) [TS-2381] Reorganize TSUrlCreate docs into separate files.
+
+ *) [TS-2377] Install man pages as part of the build.
+
*) [TS-2379] Add a new field: '%<chp>', "client_host_port" to LogFormat.
*) [TS-2374] Abort the producer if the none of it`s consumers is alive.
@@@ -26,7 -89,7 +92,11 @@@
*) [TS-2348] Rename tstop to traffic_top.
++<<<<<<< HEAD
+Changes with Apache Traffic Server 4.2.0
++=======
+ *) [TS-2384] Fix regression in key-lookup code between 4.0.x and 4.1.x
++>>>>>>> master
*) [TS-2340] Fix TextLogObject log rolling.
Author: bettydramit <b1...@gmail.com>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d6a7a9c4/iocore/cache/Cache.cc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d6a7a9c4/iocore/cache/CacheRead.cc
----------------------------------------------------------------------
diff --cc iocore/cache/CacheRead.cc
index 5dda33b,5e8c6ac..e155304
--- a/iocore/cache/CacheRead.cc
+++ b/iocore/cache/CacheRead.cc
@@@ -241,9 -241,8 +241,8 @@@ CacheVC::openReadChooseWriter(int /* ev
}
return -ECACHE_NO_DOC;
}
- #ifdef FIXME_NONMODULAR
if (cache_config_select_alternate) {
- alternate_index = HttpTransactCache::SelectFromAlternates(&vector, &request, params);
+ alternate_index = HttpTransactCache::SelectFromAlternates(&vector, &request, static_cast<HttpConfigParams*>(context));
if (alternate_index < 0)
return -ECACHE_ALT_MISS;
} else
@@@ -967,11 -967,7 +967,8 @@@ CacheVC::openReadVecWrite(int /* event
dir_overwrite(&first_key, vol, &dir, &od->first_dir);
if (od->move_resident_alt)
dir_insert(&od->single_doc_key, vol, &od->single_doc_dir);
- #ifdef FIXME_NONMODULAR
- int alt_ndx = HttpTransactCache::SelectFromAlternates(write_vector, &request, params);
++
+ int alt_ndx = HttpTransactCache::SelectFromAlternates(write_vector, &request, static_cast<HttpConfigParams*>(context));
- #else
- int alt_ndx = 0;
- #endif
vol->close_write(this);
if (alt_ndx >= 0) {
vector.clear();
@@@ -1077,11 -1073,7 +1074,7 @@@ CacheVC::openReadStartHead(int event, E
goto Ldone;
}
if (cache_config_select_alternate) {
- #ifdef FIXME_NONMODULAR
- alternate_index = HttpTransactCache::SelectFromAlternates(&vector, &request, params);
+ alternate_index = HttpTransactCache::SelectFromAlternates(&vector, &request, static_cast<HttpConfigParams*>(context));
- #else
- alternate_index = 0;
- #endif
if (alternate_index < 0) {
err = ECACHE_ALT_MISS;
goto Ldone;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d6a7a9c4/iocore/cache/P_CacheInternal.h
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d6a7a9c4/proxy/Prefetch.cc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d6a7a9c4/proxy/http/HttpSM.cc
----------------------------------------------------------------------