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/02/05 01:33:19 UTC
[25/26] git commit: Merge branch 'master' into 5.0.x
Merge branch 'master' into 5.0.x
Conflicts:
doc/reference/plugins/header_filter.en.rst
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/5e19587e
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/5e19587e
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/5e19587e
Branch: refs/heads/master
Commit: 5e19587e39bae4aaf39ebb3e71c30b9139031d90
Parents: 6629f20 a68bc23
Author: Leif Hedstrom <zw...@apache.org>
Authored: Tue Feb 4 17:29:37 2014 -0700
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Tue Feb 4 17:29:37 2014 -0700
----------------------------------------------------------------------
.gitignore | 3 +-
CHANGES | 38 +
STATUS | 4 +-
build/crypto.m4 | 35 -
cmd/traffic_shell/CliMgmtUtils.cc | 1 -
configure.ac | 24 +-
doc/admin/faqs.en.rst | 2 +-
doc/admin/monitoring-traffic.en.rst | 2 +-
doc/admin/traffic-server-error-messages.en.rst | 2 +-
.../transparent-proxy/wccp-configuration.en.rst | 2 +-
doc/reference/api/TSDebug.en.rst | 2 +-
doc/reference/api/TSRemap.en.rst | 2 +-
doc/reference/api/TSmalloc.en.rst | 2 +-
doc/reference/commands/traffic_line.en.rst | 2 +-
.../configuration/logs_xml.config.en.rst | 2 +-
.../configuration/plugin.config.en.rst | 2 +-
.../configuration/records.config.en.rst | 17 +-
doc/reference/configuration/remap.config.en.rst | 4 +-
doc/reference/plugins/authproxy.en.rst | 2 +-
doc/reference/plugins/buffer_upload.en.rst | 2 +
doc/reference/plugins/cacheurl.en.rst | 2 +
doc/reference/plugins/combo_handler.en.rst | 2 +
doc/reference/plugins/conf_remap.en.rst | 22 +-
doc/reference/plugins/esi.en.rst | 2 +
doc/reference/plugins/geoip_acl.en.rst | 2 +
doc/reference/plugins/gzip.en.rst | 2 +
doc/reference/plugins/header_rewrite.en.rst | 2 +-
doc/reference/plugins/hipes.en.rst | 2 +
doc/reference/plugins/metafilter.en.rst | 2 +
doc/reference/plugins/mysql_remap.en.rst | 2 +
doc/reference/plugins/regex_remap.en.rst | 2 +
.../plugins/stale_while_revalidate.en.rst | 2 +
doc/reference/plugins/stats_over_http.en.rst | 2 +
doc/reference/plugins/ts_lua.en.rst | 2 +
doc/reference/plugins/xdebug.en.rst | 2 +
iocore/eventsystem/I_IOBuffer.h | 1 +
iocore/eventsystem/P_IOBuffer.h | 4 +-
iocore/net/P_SSLConfig.h | 1 +
iocore/net/P_SSLNetVConnection.h | 11 +
iocore/net/SSLConfig.cc | 4 +-
iocore/net/SSLNetVConnection.cc | 17 +-
iocore/net/SSLUtils.cc | 57 +-
lib/atscppapi/Makefile.am | 2 +-
.../examples/async_http_fetch/AsyncHttpFetch.cc | 8 +-
.../examples/clientredirect/ClientRedirect.cc | 2 +-
.../examples/clientrequest/ClientRequest.cc | 3 +-
.../examples/customresponse/CustomResponse.cc | 2 +-
.../examples/data_caching/data_caching.cc | 2 +-
.../examples/globalhook/GlobalHookPlugin.cc | 2 +-
.../GzipTransformationPlugin.cc | 2 +-
.../examples/helloworld/HelloWorldPlugin.cc | 2 +-
.../InternalTransactionHandling.cc | 4 +-
.../examples/logger_example/LoggerExample.cc | 2 +-
.../MultipleTransactionHookPlugins.cc | 2 +-
.../NullTransformationPlugin.cc | 3 +-
.../examples/post_buffer/PostBuffer.cc | 4 +-
.../examples/remap_plugin/RemapPlugin.cc | 2 +-
.../examples/serverresponse/ServerResponse.cc | 2 +-
.../examples/stat_example/StatExample.cc | 4 +-
.../timeout_example/TimeoutExamplePlugin.cc | 4 +-
.../transactionhook/TransactionHookPlugin.cc | 2 +-
lib/atscppapi/src/GzipDeflateTransformation.cc | 6 +-
lib/atscppapi/src/GzipInflateTransformation.cc | 3 +-
lib/atscppapi/src/TransformationPlugin.cc | 13 +-
.../src/include/atscppapi/shared_ptr.h | 14 +-
lib/perl/lib/Apache/TS.pm | 73 --
lib/perl/lib/Apache/TS.pm.in | 90 ++
lib/perl/lib/Apache/TS/AdminClient.pm | 764 ++++++++++++++++
lib/perl/lib/Apache/TS/AdminClient.pm.in | 728 ---------------
lib/records/I_RecMutex.h | 1 +
lib/records/P_RecCore.cc | 17 +-
lib/records/P_RecUtils.h | 9 +-
lib/records/RecCore.cc | 3 -
lib/records/RecMutex.cc | 11 +-
lib/records/RecUtils.cc | 20 +-
lib/ts/Compatability.h | 1 -
lib/ts/List.h | 1 -
lib/ts/SimpleTokenizer.h | 1 -
lib/ts/Tokenizer.cc | 2 +-
lib/ts/ink_atomic.h | 2 +-
lib/ts/ink_base64.cc | 1 -
lib/ts/ink_cap.cc | 5 +
lib/ts/ink_cap.h | 9 +-
lib/ts/ink_config.h.in | 1 -
lib/ts/ink_hash_table.cc | 1 -
lib/ts/ink_lockfile.h | 1 -
lib/ts/ink_memory.cc | 20 +
lib/ts/ink_memory.h | 112 ++-
lib/ts/ink_mutex.cc | 42 +-
lib/ts/ink_mutex.h | 14 +-
lib/ts/ink_queue.cc | 1 -
lib/ts/ink_queue_ext.cc | 1 -
lib/ts/ink_queue_ext.h | 2 +-
lib/ts/ink_resource.cc | 23 +-
lib/ts/ink_resource.h | 114 +--
lib/ts/libts.h | 1 -
mgmt/MultiFile.cc | 1 -
mgmt/RecordsConfig.cc | 7 +-
mgmt/api/EventCallback.cc | 1 -
mgmt/api/GenericParser.h | 1 -
mgmt/api/Makefile.am | 1 +
mgmt/utils/ExpandingArray.cc | 2 +-
mgmt/web2/WebHttpMessage.cc | 1 -
mgmt/web2/WebHttpSession.cc | 1 -
plugins/conf_remap/conf_remap.cc | 108 ++-
proxy/Main.cc | 4 +
proxy/config/remap.config.default | 8 +
proxy/hdrs/HdrToken.cc | 18 +
proxy/hdrs/HdrToken.h | 9 +-
proxy/hdrs/MIME.cc | 20 +-
proxy/hdrs/MIME.h | 8 +
proxy/hdrs/URL.cc | 14 +
proxy/hdrs/URL.h | 6 +
proxy/http/HttpClientSession.cc | 1 +
proxy/http/HttpConfig.cc | 5 +
proxy/http/HttpConfig.h | 1 +
proxy/http/HttpDebugNames.cc | 3 +-
proxy/http/HttpProxyServerMain.cc | 2 +-
proxy/http/HttpSM.cc | 23 +-
proxy/http/HttpTransact.cc | 284 +++++-
proxy/http/HttpTransact.h | 62 +-
proxy/http/HttpTransactHeaders.cc | 7 +-
proxy/http/remap/RemapConfig.cc | 17 +-
tools/traffic_shell.pl | 900 +++++++++++++++++++
124 files changed, 2719 insertions(+), 1252 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5e19587e/CHANGES
----------------------------------------------------------------------
diff --cc CHANGES
index 04f8583,70860ed..ac7864d
--- a/CHANGES
+++ b/CHANGES
@@@ -1,16 -1,44 +1,54 @@@
-*- coding: utf-8 -*-
+Changes with Apache Traffic Server 5.0.0
+
+ *) [TS-2195] Remove the (deprecated) TSHttpTxnCacheLookupSkip API.
+
+ *) [TS-2229] Deprecate the header_filter plugin, use header_rewrite instead.
+
+ *) [TS-2290] Remove X-ID special log tag, and cleanup HdrToken confusion.
+
+ *) [TS-2088] Change TSRecordType enum values to powers of two
+
Changes with Apache Traffic Server 4.2.0
+ *) [TS-2552] configure fails to detect missing the #define for
+ SSL_CTX_set_tlsext_ticket_key_cb().
+
+ *) [TS-2549] printf() compiler warnings on OSX (clang) with the CPP APIs.
+
+ *) [TS-2532] Fix make distclean for C++ API examples.
+
+ *) [TS-2306] Client connection hang while downloading big file from origin
+ server over SSL connection
+
+ *) [TS-2353] Add ability to load ssl certs that are owned by root and only
+ read only by the user
+
+ *) [TS-2551] Eliminate the tr1 dependency from CPP APIs.
+
+ *) [TS-2541] Add WebSocket support
+
+ *) [TS-2550] Add inline configuration overrised to the conf_remap plugin.
+
+ *) [TS-2546] Move xptr and _xstrdup to ink_memory.{h,cc}.
+
+ *) [TS-2180] Small memory leak in RecCore.cc, from previous refactoring.
+
+ *) [TS-2534] Make sure RecRecord structs are always properly initialized.
+
+ *) [TS-2483] Add a new metric, proxy.node.restarts.proxy.cache_ready_time,
+ tracking absolute time when the cache started (finished
+ initialization). Until cache is available, or no cache configured, this
+ metric stays at a value of "0".
+
+ *) [TS-2517 First implementation of traffic_shell.pl, and reorg the modules
+ a bit for more consistency. Also fixes a timeout issue in AdminClient.pm.
+
+ *) [TS-1467] Disable client initiated renegotiation (SSL) DDoS by default
+
+ *) [TS-2538] Cleanup of ProcessMutex (unused) and InkMutex (dupe of
+ ink_mutex). We now use ink_mutex consistently.
+
*) [TS-2544] conf_remap plugin: allow for multiple configuration files.
*) [TS-2530] Check for loopback interfaces when computing the local address.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5e19587e/configure.ac
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5e19587e/lib/records/RecCore.cc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5e19587e/proxy/hdrs/HdrToken.cc
----------------------------------------------------------------------