[06/50] git commit: TS-2401: Remove cache_system_config_directory
TS-2401: Remove cache_system_config_directory
Remove the global cache_system_config_directory array. It was only
really being used for an error message. The only real place where
it could have been use already used Layout::sysconfdir.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/b6288c44
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/b6288c44
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/b6288c44
Branch: refs/heads/5.0.x
Commit: b6288c446f65d48f047af8b57991d41203e4f2c0
Parents: 67306a7
Author: James Peach jpe...@apache.org
Authored: Mon Dec 2 15:19:56 2013 -0800
Committer: James Peach jpe...@apache.org
Committed: Thu Dec 5 20:33:49 2013 -0800
--
iocore/cache/Cache.cc| 33 +++
iocore/cache/CacheHosting.cc | 42 ---
iocore/cache/P_CacheHosting.h| 5 ++---
iocore/cache/P_CacheInternal.h | 1 -
iocore/cache/Store.cc| 12 ++
iocore/cluster/ClusterMachine.cc | 12 --
lib/records/I_RecCore.h | 2 +-
lib/records/RecCore.cc | 6 -
8 files changed, 31 insertions(+), 82 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b6288c44/iocore/cache/Cache.cc
--
diff --git a/iocore/cache/Cache.cc b/iocore/cache/Cache.cc
index bf80228..39688a7 100644
--- a/iocore/cache/Cache.cc
+++ b/iocore/cache/Cache.cc
@@ -77,7 +77,6 @@ int cache_config_agg_write_backlog = AGG_SIZE * 2;
int cache_config_enable_checksum = 0;
int cache_config_alt_rewrite_max_size = 4096;
int cache_config_read_while_writer = 0;
-char cache_system_config_directory[PATH_NAME_MAX + 1];
int cache_config_mutex_retry_delay = 2;
#ifdef HTTP_CACHE
static int enable_cache_empty_http_doc = 0;
@@ -3358,26 +3357,6 @@ ink_cache_init(ModuleVersion v)
REC_EstablishStaticConfigInt32(cache_config_mutex_retry_delay,
proxy.config.cache.mutex_retry_delay);
Debug(cache_init, proxy.config.cache.mutex_retry_delay = %dms,
cache_config_mutex_retry_delay);
- // This is just here to make sure IOCORE standalone works, it's usually
configured in RecordsConfig.cc
- RecRegisterConfigString(RECT_CONFIG, proxy.config.config_dir,
TS_BUILD_SYSCONFDIR, RECU_DYNAMIC, RECC_NULL, NULL);
- REC_ReadConfigString(cache_system_config_directory,
proxy.config.config_dir, PATH_NAME_MAX);
- if (cache_system_config_directory[0] != '/') {
-// Not an absolute path so use system one
-Layout::get()-relative(cache_system_config_directory,
sizeof(cache_system_config_directory), cache_system_config_directory);
- }
- Debug(cache_init, proxy.config.config_dir = \%s\,
cache_system_config_directory);
- if (access(cache_system_config_directory, R_OK) == -1) {
-ink_strlcpy(cache_system_config_directory, Layout::get()-sysconfdir,
-sizeof(cache_system_config_directory));
-Debug(cache_init, proxy.config.config_dir = \%s\,
cache_system_config_directory);
-if (access(cache_system_config_directory, R_OK) == -1) {
- fprintf(stderr,unable to access() config dir '%s': %d, %s\n,
- cache_system_config_directory, errno, strerror(errno));
- fprintf(stderr, please set config path via 'proxy.config.config_dir'
\n);
- _exit(1);
-}
- }
-
REC_EstablishStaticConfigInt32(cache_config_hit_evacuate_percent,
proxy.config.cache.hit_evacuate_percent);
Debug(cache_init, proxy.config.cache.hit_evacuate_percent = %d,
cache_config_hit_evacuate_percent);
@@ -3423,16 +3402,10 @@ ink_cache_init(ModuleVersion v)
printf(%s failed\n, err);
exit(1);
}
- // XXX: The read for proxy.config.cache.storage_filename is unused!
- //
+
if (theCacheStore.n_disks == 0) {
-char p[PATH_NAME_MAX + 1];
-snprintf(p, sizeof(p), %s/, cache_system_config_directory);
-REC_ReadConfigString(p + strlen(p), proxy.config.cache.storage_filename,
PATH_NAME_MAX - strlen(p) - 1);
-if (p[strlen(p) - 1] == '/' || p[strlen(p) - 1] == '\\') {
- ink_strlcat(p, storage.config, sizeof(p));
-}
-Warning(no cache disks specified in %s: cache disabled\n, p);
+xptrchar
path(RecConfigReadConfigPath(proxy.config.cache.storage_filename,
storage.config));
+Warning(no cache disks specified in %s: cache disabled\n, (const char
*)path);
//exit(1);
}
#if TS_USE_INTERIM_CACHE == 1
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b6288c44/iocore/cache/CacheHosting.cc
--
diff --git a/iocore/cache/CacheHosting.cc b/iocore/cache/CacheHosting.cc
index 93ba8e6..e3c07e3 100644
--- a/iocore/cache/CacheHosting.cc
+++ b/iocore/cache/CacheHosting.cc
@@ -192,7 +192,7 @@
[43/50] git commit: TS-2426: fix unused variable warnings
TS-2426: fix unused variable warnings
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/ab57e59f
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/ab57e59f
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/ab57e59f
Branch: refs/heads/5.0.x
Commit: ab57e59fe645396404831bb9300d51586b570025
Parents: 536fb8e
Author: James Peach jpe...@apache.org
Authored: Tue Dec 10 12:19:35 2013 -0800
Committer: James Peach jpe...@apache.org
Committed: Tue Dec 10 12:19:35 2013 -0800
--
plugins/experimental/xdebug/xdebug.cc | 8
1 file changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab57e59f/plugins/experimental/xdebug/xdebug.cc
--
diff --git a/plugins/experimental/xdebug/xdebug.cc
b/plugins/experimental/xdebug/xdebug.cc
index e33ffa3..b91b126 100644
--- a/plugins/experimental/xdebug/xdebug.cc
+++ b/plugins/experimental/xdebug/xdebug.cc
@@ -30,7 +30,7 @@ static TSCont XInjectHeadersCont = NULL;
// Return the length of a string literal.
template int N unsigned
-lengthof(const char (str)[N]) {
+lengthof(const char ()[N]) {
return N - 1;
}
@@ -96,7 +96,7 @@ done:
}
static int
-XInjectResponseHeaders(TSCont contp, TSEvent event, void * edata)
+XInjectResponseHeaders(TSCont /* contp */, TSEvent event, void * edata)
{
TSHttpTxn txn = (TSHttpTxn)edata;
intptr_txheaders = 0;
@@ -126,7 +126,7 @@ done:
// Scan the client request headers and determine which debug headers they
// want in the response.
static int
-XScanRequestHeaders(TSCont contp, TSEvent event, void * edata)
+XScanRequestHeaders(TSCont /* contp */, TSEvent event, void * edata)
{
TSHttpTxn txn = (TSHttpTxn)edata;
intptr_txheaders = 0;
@@ -191,7 +191,7 @@ done:
}
void
-TSPluginInit(int argc, const char *argv[])
+TSPluginInit(int /* argc */, const char * /*argv */ [])
{
TSPluginRegistrationInfo info;
[13/50] git commit: Merge branch 'master' of https://github.com/SaveTheRbtz/trafficserver
Merge branch 'master' of https://github.com/SaveTheRbtz/trafficserver Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/eaaf8895 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/eaaf8895 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/eaaf8895 Branch: refs/heads/5.0.x Commit: eaaf88959d27b46cfa3c4a17d31a934836198fee Parents: 8dbf06b 6f6f05c Author: Brian Geffon bri...@apache.org Authored: Fri Dec 6 11:07:46 2013 -0800 Committer: Brian Geffon bri...@apache.org Committed: Fri Dec 6 11:07:46 2013 -0800 -- plugins/header_rewrite/conditions.cc | 4 1 file changed, 4 deletions(-) --
[42/50] git commit: TS-2424: document diagnostic logging configuration
TS-2424: document diagnostic logging configuration Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/536fb8e0 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/536fb8e0 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/536fb8e0 Branch: refs/heads/5.0.x Commit: 536fb8e018c5556e5e12ce42f4c5011b84fdcf2e Parents: 4b94cdf Author: James Peach jpe...@apache.org Authored: Tue Dec 10 11:21:42 2013 -0800 Committer: James Peach jpe...@apache.org Committed: Tue Dec 10 11:25:41 2013 -0800 -- .../configuration/records.config.en.rst | 53 .../unable-to-debug-tags.en.rst | 4 +- 2 files changed, 45 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/536fb8e0/doc/reference/configuration/records.config.en.rst -- diff --git a/doc/reference/configuration/records.config.en.rst b/doc/reference/configuration/records.config.en.rst index bbe1a4d..9d9cb39 100644 --- a/doc/reference/configuration/records.config.en.rst +++ b/doc/reference/configuration/records.config.en.rst @@ -1796,14 +1796,20 @@ server, refer to `logs_xml.config logs_xml.config`_. Diagnostic Logging Configuration -.. ts:cv:: CONFIG proxy.config.diags.output.status STRING - -.. ts:cv:: CONFIG proxy.config.diags.output.warning STRING - -.. ts:cv:: CONFIG proxy.config.diags.output.emergency STRING - - control where Traffic Server should log diagnostic output. Messages at diagnostic level can be directed to any combination of diagnostic - destinations. Valid diagnostic message destinations are::: +.. ts:cv:: CONFIG proxy.config.diags.output.diag STRING E +.. ts:cv:: CONFIG proxy.config.diags.output.debug STRING E +.. ts:cv:: CONFIG proxy.config.diags.output.status STRING L +.. ts:cv:: CONFIG proxy.config.diags.output.note STRING L +.. ts:cv:: CONFIG proxy.config.diags.output.warning STRING L +.. ts:cv:: CONFIG proxy.config.diags.output.error STRING SL +.. ts:cv:: CONFIG proxy.config.diags.output.fatal STRING SL +.. ts:cv:: CONFIG proxy.config.diags.output.alert STRING L +.. ts:cv:: CONFIG proxy.config.diags.output.emergency STRING SL + + The diagnosic output configuration variables control where Traffic + Server should log diagnostic output. Messages at each diagnostic level + can be directed to any combination of diagnostic destinations. + Valid diagnostic message destinations are: * 'O' = Log to standard output * 'E' = Log to standard error @@ -1812,9 +1818,36 @@ Diagnostic Logging Configuration .. topic:: Example - To log debug diagnostics to both syslog and diags.log::: + To log debug diagnostics to both syslog and `diags.log`:: + +CONFIG proxy.config.diags.output.debug STRING SL + +.. ts:cv:: CONFIG proxy.config.diags.show_location INT 0 + + Annotates diagnostic messages with the source code location. + +.. ts:cv:: CONFIG proxy.config.diags.debug.enabled INT 0 + + Enables logging for diagnostic messages whose log level is `diag` or `debug`. + +.. ts:cv:: CONFIG proxy.config.diags.debug.tags STRING NULL + + Each Traffic Server `diag` and `debug` level message is annotated + with a subsytem tag. This configuration contains a regular + expression that filters the messages based on the tag. Some + commonly used debug tags are:: + + = +Tag Subsytem usage + = +ssl TLS termination and certificate processing +dns DNS query resolution +http_hdrs Logs the headers for HTTP requests and responses + = -proxy.config.diags.output.debug STRING SL + Traffic Server plugins will typically log debug messages using + the :func:`TSDebug` API, passing the plugin name as the debug + tag. Reverse Proxy = http://git-wip-us.apache.org/repos/asf/trafficserver/blob/536fb8e0/doc/sdk/troubleshooting-tips/unable-to-debug-tags.en.rst -- diff --git a/doc/sdk/troubleshooting-tips/unable-to-debug-tags.en.rst b/doc/sdk/troubleshooting-tips/unable-to-debug-tags.en.rst index 5ed5877..745712a 100644 --- a/doc/sdk/troubleshooting-tips/unable-to-debug-tags.en.rst +++ b/doc/sdk/troubleshooting-tips/unable-to-debug-tags.en.rst @@ -43,8 +43,8 @@ Set the following variables in :file:`records.config` (in the Traffic Server :: :::text - proxy.config.diags.debug.enabled INT 1 - proxy.config.diags.debug.tags STRING debug-tag-name + CONFIG
[19/50] git commit: TS-2419: Don't close client connection when responding with a 204 and there is no body
TS-2419: Don't close client connection when responding with a 204 and there is
no body
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/1bcff787
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/1bcff787
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/1bcff787
Branch: refs/heads/5.0.x
Commit: 1bcff7873b5cd701d90a00191d6646210ab9e7c3
Parents: a10b809
Author: Bryan Call bc...@apache.org
Authored: Fri Dec 6 16:57:46 2013 -0800
Committer: Bryan Call bc...@apache.org
Committed: Fri Dec 6 16:57:46 2013 -0800
--
proxy/http/HttpTransact.cc | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1bcff787/proxy/http/HttpTransact.cc
--
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index 991e1bf..a7a14a2 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -6756,9 +6756,10 @@ HttpTransact::handle_response_keep_alive_headers(State*
s, HTTPVersion ver, HTTP
} else if (HTTP_MAJOR(ver.m_version) == 0) { /* No K-A for 0.9 apps */
ka_action = KA_DISABLED;
}
- // some systems hang until the connection closes when receiving a 204
- // regardless of the K-A headers
- else if (heads-status_get() == HTTP_STATUS_NO_CONTENT) {
+ else if (heads-status_get() == HTTP_STATUS_NO_CONTENT
+ (s-current.server-transfer_encoding != NO_TRANSFER_ENCODING ||
s-hdr_info.request_content_length != 0)) {
+// some systems hang until the connection closes when receiving a 204
regardless of the K-A headers
+// close if there is any body response from the origin
ka_action = KA_CLOSE;
} else {
// Determine if we are going to send either a server-generated or
[37/50] git commit: TS-2426: document the xdebug plugin
TS-2426: document the xdebug plugin Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/399e27cc Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/399e27cc Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/399e27cc Branch: refs/heads/5.0.x Commit: 399e27cc14be15d20ac786860f40a031a9be38e3 Parents: 14667c6 Author: James Peach jpe...@apache.org Authored: Sat Dec 7 20:29:42 2013 -0800 Committer: James Peach jpe...@apache.org Committed: Tue Dec 10 09:28:18 2013 -0800 -- doc/reference/plugins/index.en.rst | 1 + doc/reference/plugins/xdebug.en.rst | 45 2 files changed, 46 insertions(+) -- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/399e27cc/doc/reference/plugins/index.en.rst -- diff --git a/doc/reference/plugins/index.en.rst b/doc/reference/plugins/index.en.rst index 4001acc..4b9307b 100644 --- a/doc/reference/plugins/index.en.rst +++ b/doc/reference/plugins/index.en.rst @@ -73,4 +73,5 @@ directory of the Apache Traffic Server source tree. Exmperimental plugins can be mysql_remap.en stale_while_revalidate.en ts_lua.en + xdebug.en http://git-wip-us.apache.org/repos/asf/trafficserver/blob/399e27cc/doc/reference/plugins/xdebug.en.rst -- diff --git a/doc/reference/plugins/xdebug.en.rst b/doc/reference/plugins/xdebug.en.rst new file mode 100644 index 000..bf2ac13 --- /dev/null +++ b/doc/reference/plugins/xdebug.en.rst @@ -0,0 +1,45 @@ +XDebug Plugin +* + +.. Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + License); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +The `XDebug` plugin allows HTTP clients to debug the operation of +the Traffic Server cache using the ``X-Debug`` header. The plugin +is triggered by the presence of the ``X-Debug`` header in the client +request. The contents of this header should be the names of the +debug headers that are desired in the response. The `XDebug` plugin +will remove the ``X-Debug`` header from the client request and +inject the desired headers into the client response. + +`XDebug` is a global plugin. It is installed by adding it to the +:file:`plugin.config` file. + +Debugging Headers += + +The `XDebug` plugin is able to generate the following debugging headers: + +Via +If the ``Via`` header is requested, the `XDebug` plugin sets the +:ts:cv:`proxy.config.http.insert_response_via_str` configuration variable +to ``3`` for the request. + +X-Cache-Key +The ``X-Cache-Key`` contains the URL that identifies the HTTP object in the +Traffic Server cache. This header is particularly useful if a custom cache +key is being used.
[10/50] git commit: TS-2401: update CHANGES
TS-2401: update CHANGES Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/a514c64a Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/a514c64a Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/a514c64a Branch: refs/heads/5.0.x Commit: a514c64a35bebdd29237e73c6844604b77cd9a95 Parents: ccc01b6 Author: James Peach jpe...@apache.org Authored: Thu Dec 5 20:33:20 2013 -0800 Committer: James Peach jpe...@apache.org Committed: Thu Dec 5 20:34:10 2013 -0800 -- CHANGES | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a514c64a/CHANGES -- diff --git a/CHANGES b/CHANGES index 03a04c6..309edcf 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,8 @@ Changes with Apache Traffic Server 4.2.0 + *) [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
[30/50] git commit: TS-2077 Remove proxy.config.http.user_agent_pipeline remnants
TS-2077 Remove proxy.config.http.user_agent_pipeline remnants
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/1247f0d6
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/1247f0d6
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/1247f0d6
Branch: refs/heads/5.0.x
Commit: 1247f0d659801d5c8611622955f5ec008fa6856d
Parents: adbccf9
Author: Leif Hedstrom zw...@apache.org
Authored: Fri Jul 26 10:32:18 2013 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Tue Dec 10 07:56:06 2013 -0700
--
ci/jenkins/records.config | 1 -
lib/perl/lib/Apache/TS/AdminClient.pm | 1 -
mgmt/RecordsConfig.cc | 4 +---
proxy/config/records.config.default.in | 1 -
proxy/http/HttpConfig.cc | 2 --
proxy/http/HttpConfig.h| 2 --
6 files changed, 1 insertion(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1247f0d6/ci/jenkins/records.config
--
diff --git a/ci/jenkins/records.config b/ci/jenkins/records.config
index ba99c95..11057d6 100644
--- a/ci/jenkins/records.config
+++ b/ci/jenkins/records.config
@@ -140,7 +140,6 @@ CONFIG proxy.config.http.send_http11_requests INT 1
# 2 - Share, with a connection pool per worker thread
CONFIG proxy.config.http.share_server_sessions INT 2
CONFIG proxy.config.http.origin_server_pipeline INT 1
-CONFIG proxy.config.http.user_agent_pipeline INT 8
##
# HTTP referer filtering #
##
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1247f0d6/lib/perl/lib/Apache/TS/AdminClient.pm
--
diff --git a/lib/perl/lib/Apache/TS/AdminClient.pm
b/lib/perl/lib/Apache/TS/AdminClient.pm
index f6fa827..6f6ea73 100644
--- a/lib/perl/lib/Apache/TS/AdminClient.pm
+++ b/lib/perl/lib/Apache/TS/AdminClient.pm
@@ -521,7 +521,6 @@ The Apache Traffic Server Administration Manual will
explain what these strings
proxy.config.http.transaction_no_activity_timeout_out
proxy.config.http_ui_enabled
proxy.config.http.uncacheable_requests_bypass_parent
- proxy.config.http.user_agent_pipeline
proxy.config.icp.default_reply_port
proxy.config.icp.enabled
proxy.config.icp.icp_configuration
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1247f0d6/mgmt/RecordsConfig.cc
--
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index bf3674e..1b45bfb 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -426,7 +426,7 @@ RecordElement RecordsConfig[] = {
// #
{RECT_CONFIG, proxy.config.http.send_http11_requests, RECD_INT, 1,
RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
- // # origin_server_pipeline and user_agent_pipeline
+ // # origin_server_pipeline
// #
// # 0 - no keepalive
// # n = 1 - max pipeline window
@@ -434,8 +434,6 @@ RecordElement RecordsConfig[] = {
// #
{RECT_CONFIG, proxy.config.http.origin_server_pipeline, RECD_INT, 1,
RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
- {RECT_CONFIG, proxy.config.http.user_agent_pipeline, RECD_INT, 8,
RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
- ,
{RECT_CONFIG, proxy.config.http.share_server_sessions, RECD_INT, 2,
RECU_RESTART_TS, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
{RECT_CONFIG, proxy.config.http.record_heartbeat, RECD_INT, 0,
RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1247f0d6/proxy/config/records.config.default.in
--
diff --git a/proxy/config/records.config.default.in
b/proxy/config/records.config.default.in
index 870637d..bc3c9ce 100644
--- a/proxy/config/records.config.default.in
+++ b/proxy/config/records.config.default.in
@@ -146,7 +146,6 @@ CONFIG proxy.config.http.send_http11_requests INT 1
# 2 - Share, with a connection pool per worker thread
CONFIG proxy.config.http.share_server_sessions INT 2
CONFIG proxy.config.http.origin_server_pipeline INT 1
-CONFIG proxy.config.http.user_agent_pipeline INT 8
##
# HTTP referer filtering #
##
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1247f0d6/proxy/http/HttpConfig.cc
--
diff --git a/proxy/http/HttpConfig.cc b/proxy/http/HttpConfig.cc
index d36b3cc..0ec4d61 100644
--- a/proxy/http/HttpConfig.cc
+++ b/proxy/http/HttpConfig.cc
@@ -1179,7 +1179,6 @@ HttpConfig::startup()
[27/50] git commit: add TS-2386
add TS-2386 Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/a2de1c05 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/a2de1c05 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/a2de1c05 Branch: refs/heads/5.0.x Commit: a2de1c05436e90605c2805584252cc428994515c Parents: 707a5e7 Author: Zhao Yongming ming@gmail.com Authored: Sat Dec 7 15:49:13 2013 +0800 Committer: Zhao Yongming ming@gmail.com Committed: Sat Dec 7 15:49:13 2013 +0800 -- CHANGES | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a2de1c05/CHANGES -- diff --git a/CHANGES b/CHANGES index 2e1e7b6..965d50d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 4.2.0 + *) [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
[17/50] git commit: TS-1146: additional autoconf tests to support older OpenSSL
TS-1146: additional autoconf tests to support older OpenSSL
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/358e9260
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/358e9260
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/358e9260
Branch: refs/heads/5.0.x
Commit: 358e92603dd0527122d3142f0a74a9d7280e595f
Parents: 6dabbd7
Author: James Peach jpe...@apache.org
Authored: Fri Dec 6 15:26:22 2013 -0800
Committer: James Peach jpe...@apache.org
Committed: Fri Dec 6 15:27:31 2013 -0800
--
build/crypto.m4| 35 +++
configure.ac | 4
iocore/net/SSLUtils.cc | 24 ++--
lib/ts/ink_config.h.in | 1 +
4 files changed, 62 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/358e9260/build/crypto.m4
--
diff --git a/build/crypto.m4 b/build/crypto.m4
index 998e147..0b8db8f 100644
--- a/build/crypto.m4
+++ b/build/crypto.m4
@@ -139,6 +139,41 @@ AC_DEFUN([TS_CHECK_CRYPTO_NEXTPROTONEG], [
AC_SUBST(use_tls_npn)
])
+AC_DEFUN([TS_CHECK_CRYPTO_TICKETS], [
+ _tickets_saved_LIBS=$LIBS
+ enable_tls_tickets=yes
+
+ TS_ADDTO(LIBS, [$LIBSSL])
+ AC_CHECK_HEADERS(openssl/tls1.h openssl/ssl.h openssl/ts.h openssl/hmac.h
openssl/evp.h)
+ AC_MSG_CHECKING([for SSL_CTX_set_tlsext_ticket_key_cb])
+ AC_COMPILE_IFELSE(
+ [
+AC_LANG_PROGRAM([[
+#if HAVE_OPENSSL_SSL_H
+#include openssl/ssl.h
+#endif
+#if HAVE_OPENSSL_TLS1_H
+#include openssl/tls1.h
+#endif
+ ]],
+ [[SSL_CTX_set_tlsext_ticket_key_cb(NULL, NULL);]])
+ ],
+ [
+AC_MSG_RESULT([yes])
+ ],
+ [
+AC_MSG_RESULT([no])
+enable_tls_tickets=no
+ ])
+
+ LIBS=$_tickets_saved_LIBS
+
+ AC_MSG_CHECKING(whether to enable TLS session ticket support)
+ AC_MSG_RESULT([$enable_tls_tickets])
+ TS_ARG_ENABLE_VAR([use], [tls-tickets])
+ AC_SUBST(use_tls_tickets)
+])
+
AC_DEFUN([TS_CHECK_CRYPTO_SNI], [
_sni_saved_LIBS=$LIBS
enable_tls_sni=yes
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/358e9260/configure.ac
--
diff --git a/configure.ac b/configure.ac
index dde8c40..c06c173 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1131,6 +1131,10 @@ TS_CHECK_CRYPTO_EC_KEYS
TS_CHECK_CRYPTO_SNI
#
+# Check for RFC5077 TLS session ticket support.
+TS_CHECK_CRYPTO_TICKETS
+
+#
# Check for zlib presence and usability
TS_CHECK_ZLIB
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/358e9260/iocore/net/SSLUtils.cc
--
diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc
index ce1d383..f7b5f4b 100644
--- a/iocore/net/SSLUtils.cc
+++ b/iocore/net/SSLUtils.cc
@@ -30,7 +30,14 @@
#include openssl/x509.h
#include openssl/asn1.h
#include openssl/rand.h
+
+#if HAVE_OPENSSL_EVP_H
#include openssl/evp.h
+#endif
+
+#if HAVE_OPENSSL_HMAC_H
+#include openssl/hmac.h
+#endif
#if HAVE_OPENSSL_TS_H
#include openssl/ts.h
@@ -62,6 +69,7 @@ typedef const SSL_METHOD * ink_ssl_method_t;
typedef SSL_METHOD * ink_ssl_method_t;
#endif
+#if TS_USE_TLS_TICKETS
struct ssl_ticket_key_t
{
unsigned char key_name[16];
@@ -69,10 +77,12 @@ struct ssl_ticket_key_t
unsigned char aes_key[16];
};
-static ProxyMutex ** sslMutexArray;
-static bool open_ssl_initialized = false;
static int ssl_callback_session_ticket(SSL *, unsigned char *, unsigned char
*, EVP_CIPHER_CTX *, HMAC_CTX *, int);
static int ssl_session_ticket_index = 0;
+#endif /* TS_USE_TLS_TICKETS */
+
+static ProxyMutex ** sslMutexArray;
+static bool open_ssl_initialized = false;
struct ats_file_bio
{
@@ -232,6 +242,7 @@ ssl_context_enable_ecdh(SSL_CTX * ctx)
static SSL_CTX *
ssl_context_enable_tickets(SSL_CTX * ctx, const char * ticket_key_path)
{
+#if TS_USE_TLS_TICKETS
xptrchar ticket_key_data;
int ticket_key_len;
ssl_ticket_key_t * ticket_key = NULL;
@@ -271,6 +282,11 @@ ssl_context_enable_tickets(SSL_CTX * ctx, const char *
ticket_key_path)
fail:
delete ticket_key;
return ctx;
+
+#else /* TS_USE_TLS_TICKETS */
+ (void)ticket_key_path;
+ return ctx;
+#endif /* TS_USE_TLS_TICKETS */
}
void
@@ -684,11 +700,13 @@ ssl_store_ssl_context(
}
}
+#if defined(SSL_OP_NO_TICKET)
// Session tickets are enabled by default. Disable if explicitly requested.
if (session_ticket_enabled == 0) {
SSL_CTX_set_options(ctx, SSL_OP_NO_TICKET);
Debug(ssl, ssl session ticket is disabled);
}
+#endif
// Load the session ticket key if session tickets are not disabled and we
have key name.
if (session_ticket_enabled != 0 ticket_key_filename) {
@@
[29/50] git commit: Fixed a bunch of misspelled words in comments
Fixed a bunch of misspelled words in comments
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/adbccf96
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/adbccf96
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/adbccf96
Branch: refs/heads/5.0.x
Commit: adbccf960187870d00817b7a9353fb718f4d97dc
Parents: b57a809
Author: Bryan Call bc...@apache.org
Authored: Sun Dec 8 14:48:47 2013 -0800
Committer: Bryan Call bc...@apache.org
Committed: Sun Dec 8 14:48:47 2013 -0800
--
proxy/http/HttpSM.cc | 86 +++
1 file changed, 43 insertions(+), 43 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/adbccf96/proxy/http/HttpSM.cc
--
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index 1ae8615..cc79002 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -76,7 +76,7 @@ ink_mutex debug_sm_list_mutex;
// sparse initialization, not copying dead space for history.
//
// Most of the content of in the prototype object consists of zeroes.
-// To take advantage of that, a scatter list is contructed of
+// To take advantage of that, a scatter list is constructed of
// the non-zero words, and those values are scattered onto the
// new object after first zeroing out the object (except for dead space).
//
@@ -536,7 +536,7 @@ HttpSM::state_add_to_list(int event, void * /* data
ATS_UNUSED */)
int
HttpSM::state_remove_from_list(int event, void * /* data ATS_UNUSED */)
{
- // The config parameters are guranteed not change
+ // The config parameters are guaranteed not change
// across the life of a transaction so it safe to
// check the config here and use it detrmine
// whether we need to strip ourselves off of the
@@ -564,8 +564,8 @@ int
HttpSM::kill_this_async_hook(int /* event ATS_UNUSED */, void * /* data
ATS_UNUSED */)
{
// In the base HttpSM, we don't have anything to
- // do here. subclasses can overide this function
- // to do their own asyncronous cleanup
+ // do here. subclasses can override this function
+ // to do their own asynchronous cleanup
// So We're now ready to finish off the state machine
terminate_sm = true;
kill_this_async_done = true;
@@ -626,7 +626,7 @@ HttpSM::attach_client_session(HttpClientSession *
client_vc, IOBufferReader * bu
}
// We first need to run the transaction start hook. Since
- // this hook maybe asyncronous, we need to disable IO on
+ // this hook maybe asynchronous, we need to disable IO on
// client but set the continuation to be the state machine
// so if we get an timeout events the sm handles them
ua_entry-read_vio = client_vc-do_io_read(this, 0, buffer_reader-mbuf);
@@ -977,7 +977,7 @@ HttpSM::setup_push_read_response_header()
resp_hdr_state = state_read_push_response_header(VC_EVENT_READ_READY,
ua_entry-read_vio);
}
}
- // It is possible that the entire PUSHed responsed header was already
+ // It is possible that the entire PUSHed response header was already
// in the buffer. In this case we don't want to fire off any more
// IO since we are going to switch buffers when we go to tunnel to
// the cache
@@ -1149,7 +1149,7 @@ HttpSM::state_raw_http_server_open(int event, void *data)
//
// We've done a successful transform open and issued a do_io_write
//to the transform. We are now ready for the transform to tell
-//us it is now ready to be read from and it done modifing the
+//us it is now ready to be read from and it done modifying the
//server request header
//
int
@@ -1189,7 +1189,7 @@ HttpSM::state_request_wait_for_transform_read(int event,
void *data)
//
// We've done a successful transform open and issued a do_io_write
//to the transform. We are now ready for the transform to tell
-//us it is now ready to be read from and it done modifing the
+//us it is now ready to be read from and it done modifying the
//user agent response header
//
int
@@ -1220,7 +1220,7 @@ HttpSM::state_response_wait_for_transform_read(int event,
void *data)
// int HttpSM::state_common_wait_for_transform_read(...)
//
-// This function handles the overlapping cases bewteen request and response
+// This function handles the overlapping cases between request and response
// transforms which prevents code duplication
//
int
@@ -1254,7 +1254,7 @@
HttpSM::state_common_wait_for_transform_read(HttpTransformInfo * t_info, HttpSMH
ink_assert(t_info == post_transform_info);
return (this-*tunnel_handler) (event, data);
} else {
-// On the reponse side, we just forward as much
+// On the response
[11/50] git commit: Fix typo
Fix typo
Fixed typo breaking HTML rendering
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/16882d82
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/16882d82
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/16882d82
Branch: refs/heads/5.0.x
Commit: 16882d8224a0af0f0de597709ee6587295ee9e04
Parents: a514c64
Author: Jean Baptiste Favre git...@jbfavre.org
Authored: Fri Dec 6 17:53:03 2013 +0100
Committer: Jean Baptiste Favre git...@jbfavre.org
Committed: Fri Dec 6 17:53:03 2013 +0100
--
.../sample-buffered-null-transformation-plugin.en.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/16882d82/doc/sdk/http-transformation-plugin/sample-buffered-null-transformation-plugin.en.rst
--
diff --git
a/doc/sdk/http-transformation-plugin/sample-buffered-null-transformation-plugin.en.rst
b/doc/sdk/http-transformation-plugin/sample-buffered-null-transformation-plugin.en.rst
index b9f6826..866eb61 100644
---
a/doc/sdk/http-transformation-plugin/sample-buffered-null-transformation-plugin.en.rst
+++
b/doc/sdk/http-transformation-plugin/sample-buffered-null-transformation-plugin.en.rst
@@ -203,7 +203,7 @@ transform:
vconnection:
**Writing the Buffered Data to the Output Vconnection**
- {#WritingBufferedtDataIntoVConnection)
+ {#WritingBufferedtDataIntoVConnection}
.. figure:: /static/images/sdk/vconn_buf_output.jpg
:alt: Writing the Buffered Data to the Output Vconnection
[46/50] git commit: TS-2190: fix the -Werror build
TS-2190: fix the -Werror build
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/a302c86e
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/a302c86e
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/a302c86e
Branch: refs/heads/5.0.x
Commit: a302c86ee226cb354339ee42f044a459333a2376
Parents: 1410994
Author: James Peach jpe...@apache.org
Authored: Tue Dec 10 21:00:39 2013 -0800
Committer: James Peach jpe...@apache.org
Committed: Wed Dec 11 20:08:54 2013 -0800
--
ci/regression | 1 +
plugins/cacheurl/cacheurl.c | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a302c86e/ci/regression
--
diff --git a/ci/regression b/ci/regression
index 495b380..0728498 100755
--- a/ci/regression
+++ b/ci/regression
@@ -87,6 +87,7 @@ configure() {
$SRCROOT/configure \
--prefix=$DSTROOT \
--enable-debug \
+ --enable-werror \
--enable-experimental-plugins \
$(extras) \
CC=$CC \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a302c86e/plugins/cacheurl/cacheurl.c
--
diff --git a/plugins/cacheurl/cacheurl.c b/plugins/cacheurl/cacheurl.c
index 3b3e98d..455dba3 100644
--- a/plugins/cacheurl/cacheurl.c
+++ b/plugins/cacheurl/cacheurl.c
@@ -355,7 +355,6 @@ static void initialization_error(char *msg) {
TSReturnCode TSRemapInit(TSRemapInterface *api_info, char *errbuf,
int errbuf_size) {
-TSReturnCode error;
if (!api_info) {
strncpy(errbuf, [tsremap_init] Invalid TSRemapInterface argument,
errbuf_size - 1);
@@ -416,7 +415,6 @@ TSRemapStatus TSRemapDoRemap(void* ih, TSHttpTxn rh,
TSRemapRequestInfo *rri ATS
void TSPluginInit(int argc, const char *argv[]) {
TSPluginRegistrationInfo info;
-TSReturnCode error;
TSCont contp;
pr_list *prl;
[08/50] git commit: TS-2401: Remove global system_runtime_dir
TS-2401: Remove global system_runtime_dir
Introduce RecConfigReadRuntimeDir() to centralize overriding
Layout::runtimedir with proxy.config.local_state_dir. Use this to
replace all the instances of system_runtime_dir.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/f438ab45
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/f438ab45
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/f438ab45
Branch: refs/heads/5.0.x
Commit: f438ab45e6c467a6e4fbb595c0547a06e91715d3
Parents: 88f5176
Author: James Peach jpe...@apache.org
Authored: Wed Nov 27 21:24:28 2013 -0800
Committer: James Peach jpe...@apache.org
Committed: Thu Dec 5 20:33:49 2013 -0800
--
cmd/traffic_cop/traffic_cop.cc | 16 +-
example/app-template/app-template.cc | 2 --
iocore/hostdb/HostDB.cc | 31 +++
iocore/hostdb/MultiCache.cc | 6 ++--
lib/records/I_RecCore.h | 4 +++
lib/records/I_RecDefs.h | 2 --
lib/records/RecConfigParse.cc| 1 +
lib/records/RecCore.cc | 16 ++
mgmt/LocalManager.cc | 5 +++-
mgmt/Main.cc | 8 ++---
mgmt/ProcessManager.cc | 4 ++-
mgmt/web2/WebIntrMain.cc | 5 ++--
proxy/Main.cc| 49 +--
proxy/StatSystem.cc | 20 -
proxy/logging/LogStandalone.cc | 1 -
15 files changed, 97 insertions(+), 73 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f438ab45/cmd/traffic_cop/traffic_cop.cc
--
diff --git a/cmd/traffic_cop/traffic_cop.cc b/cmd/traffic_cop/traffic_cop.cc
index 7a258b8..564f070 100644
--- a/cmd/traffic_cop/traffic_cop.cc
+++ b/cmd/traffic_cop/traffic_cop.cc
@@ -542,6 +542,20 @@ ConfigIntFatalError:
exit(1);
}
+static const char *
+config_read_runtime_dir()
+{
+ char state_dir[PATH_NAME_MAX + 1];
+
+ state_dir[0] = '\0';
+ config_read_string(proxy.config.local_state_dir, state_dir,
sizeof(state_dir), true);
+ if (strlen(state_dir) 0) {
+return Layout::get()-relative(state_dir);
+ } else {
+return ats_strdup(Layout::get()-runtimedir);
+ }
+}
+
static void
config_reload_records()
{
@@ -1700,7 +1714,7 @@ init_config_dir()
cop_log_trace(Entering init_config_dir()\n);
root_dir = Layout::get()-prefix;
- runtime_dir = Layout::get()-runtimedir;
+ runtime_dir = config_read_runtime_dir();
config_dir = Layout::get()-sysconfdir;
if (chdir(root_dir) 0) {
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f438ab45/example/app-template/app-template.cc
--
diff --git a/example/app-template/app-template.cc
b/example/app-template/app-template.cc
index 5f8cb6d..af23b2b 100644
--- a/example/app-template/app-template.cc
+++ b/example/app-template/app-template.cc
@@ -53,7 +53,6 @@ int system_num_of_processors = ink_number_of_processors();
int system_num_of_net_threads = DEFAULT_NUMBER_OF_THREADS;
int system_num_of_udp_threads = DEFAULT_NUMBER_OF_UDP_THREADS;
-char system_runtime_dir[PATH_NAME_MAX + 1];
char system_config_directory[PATH_NAME_MAX + 1];
//int system_remote_management_flag = DEFAULT_REMOTE_MANAGEMENT_FLAG;
@@ -157,7 +156,6 @@ int main(int argc, char * argv[])
// Get TS directories
ink_strlcpy(system_config_directory, Layout::get()-sysconfdir,
sizeof(system_config_directory));
- ink_strlcpy(system_runtime_dir, Layout::get()-runtimedir,
sizeof(system_runtime_dir));
if (chdir(Layout::get()-prefix) 0) {
fprintf(stderr,unable to change to root directory \%s\ [%d '%s']\n,
Layout::get()-prefix, errno, strerror(errno));
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f438ab45/iocore/hostdb/HostDB.cc
--
diff --git a/iocore/hostdb/HostDB.cc b/iocore/hostdb/HostDB.cc
index 0ffd5bc..e0fe928 100644
--- a/iocore/hostdb/HostDB.cc
+++ b/iocore/hostdb/HostDB.cc
@@ -380,6 +380,8 @@ HostDBCache::start(int flags)
bool reconfigure = ((flags PROCESSOR_RECONFIGURE) ? true : false);
bool fix = ((flags PROCESSOR_FIX) ? true : false);
+ storage_path[0] = '\0';
+
// Read configuration
// Command line overrides manager configuration.
//
@@ -390,20 +392,22 @@ HostDBCache::start(int flags)
REC_ReadConfigString(storage_path, proxy.config.hostdb.storage_path,
PATH_NAME_MAX);
REC_ReadConfigInt32(storage_size, proxy.config.hostdb.storage_size);
- if (storage_path[0] != '/') {
-Layout::relative_to(storage_path, PATH_NAME_MAX, Layout::get()-prefix,
storage_path);
+ // If
[16/50] git commit: Merge branch 'patch-2' of https://github.com/jbfavre/trafficserver
Merge branch 'patch-2' of https://github.com/jbfavre/trafficserver Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/6dabbd7b Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/6dabbd7b Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/6dabbd7b Branch: refs/heads/5.0.x Commit: 6dabbd7ba30d1363bb9288ad77ed4093198fa7c3 Parents: 0850f4c 82ad4ef Author: James Peach jpe...@apache.org Authored: Fri Dec 6 14:39:54 2013 -0800 Committer: James Peach jpe...@apache.org Committed: Fri Dec 6 14:39:54 2013 -0800 -- .../sample-buffered-null-transformation-plugin.en.rst| 8 1 file changed, 4 insertions(+), 4 deletions(-) --
[20/50] git commit: udpated release notes
udpated release notes Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/960c3f8f Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/960c3f8f Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/960c3f8f Branch: refs/heads/5.0.x Commit: 960c3f8f48f92280fff9495e2cfda752d3d7e4af Parents: 1bcff78 Author: Bryan Call bc...@apache.org Authored: Fri Dec 6 16:59:09 2013 -0800 Committer: Bryan Call bc...@apache.org Committed: Fri Dec 6 16:59:09 2013 -0800 -- CHANGES | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/960c3f8f/CHANGES -- diff --git a/CHANGES b/CHANGES index 429ac04..cacc5ad 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,7 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 4.2.0 + *) [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 sun...@yahoo-inc.com
[01/50] git commit: TS-2401: Remove unused TS_BUILD_SYSCONFIGDIR
Updated Branches: refs/heads/5.0.x c63666b13 - 93e7027b4 TS-2401: Remove unused TS_BUILD_SYSCONFIGDIR Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/bdd7af5d Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/bdd7af5d Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/bdd7af5d Branch: refs/heads/5.0.x Commit: bdd7af5dcfcff16ebb07d62c9bdac2de5cf8a3bf Parents: fa100cf Author: James Peach jpe...@apache.org Authored: Wed Nov 27 15:13:04 2013 -0800 Committer: James Peach jpe...@apache.org Committed: Thu Dec 5 20:33:48 2013 -0800 -- lib/ts/ink_config.h.in | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bdd7af5d/lib/ts/ink_config.h.in -- diff --git a/lib/ts/ink_config.h.in b/lib/ts/ink_config.h.in index ee1e029..0b69098 100644 --- a/lib/ts/ink_config.h.in +++ b/lib/ts/ink_config.h.in @@ -110,7 +110,6 @@ #define TS_BUILD_BINDIR @rel_bindir@ #define TS_BUILD_SBINDIR @rel_sbindir@ #define TS_BUILD_SYSCONFDIR @rel_sysconfdir@ -#define TS_BUILD_SYSCONFIGDIR @exp_sysconfdir@ #define TS_BUILD_DATADIR @rel_datadir@ #define TS_BUILD_INCLUDEDIR @rel_includedir@ #define TS_BUILD_LIBDIR @rel_libdir@
[25/50] git commit: TS-2082: remove FIXME_NONMODULAR defines
TS-2082: remove FIXME_NONMODULAR defines
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/0b3367a8
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/0b3367a8
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/0b3367a8
Branch: refs/heads/5.0.x
Commit: 0b3367a8e1f52cf2ac3ca8c458156f11e89bfa70
Parents: db8052d
Author: Zhao Yongming ming@gmail.com
Authored: Sat Dec 7 15:11:39 2013 +0800
Committer: Zhao Yongming ming@gmail.com
Committed: Sat Dec 7 15:19:16 2013 +0800
--
CHANGES | 2 +-
iocore/cache/CacheRead.cc | 10 --
iocore/cache/Notes| 3 ---
lib/ts/ink_config.h.in| 1 -
4 files changed, 1 insertion(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0b3367a8/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 6745047..be9c8c7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,7 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 4.2.0
- *) [TS-2082] remove STANDALONE_IOCORE and NON_MODULAR defines
+ *) [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
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0b3367a8/iocore/cache/CacheRead.cc
--
diff --git a/iocore/cache/CacheRead.cc b/iocore/cache/CacheRead.cc
index 6121668..5e8c6ac 100644
--- a/iocore/cache/CacheRead.cc
+++ b/iocore/cache/CacheRead.cc
@@ -241,13 +241,11 @@ CacheVC::openReadChooseWriter(int /* event ATS_UNUSED */,
Event * /* e ATS_UNUSE
}
return -ECACHE_NO_DOC;
}
-#ifdef FIXME_NONMODULAR
if (cache_config_select_alternate) {
alternate_index = HttpTransactCache::SelectFromAlternates(vector,
request, params);
if (alternate_index 0)
return -ECACHE_ALT_MISS;
} else
-#endif
alternate_index = 0;
CacheHTTPInfo *obj = vector.get(alternate_index);
for (w = (CacheVC *) od-writers.head; w; w = (CacheVC *)
w-opendir_link.next) {
@@ -969,11 +967,7 @@ CacheVC::openReadVecWrite(int /* event ATS_UNUSED */,
Event * /* e ATS_UNUSED */
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);
-#else
- int alt_ndx = 0;
-#endif
vol-close_write(this);
if (alt_ndx = 0) {
vector.clear();
@@ -1079,11 +1073,7 @@ CacheVC::openReadStartHead(int event, Event * e)
goto Ldone;
}
if (cache_config_select_alternate) {
-#ifdef FIXME_NONMODULAR
alternate_index = HttpTransactCache::SelectFromAlternates(vector,
request, params);
-#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/0b3367a8/iocore/cache/Notes
--
diff --git a/iocore/cache/Notes b/iocore/cache/Notes
index 0992d25..54d35c8 100644
--- a/iocore/cache/Notes
+++ b/iocore/cache/Notes
@@ -22,9 +22,6 @@ TS because there are a lot of stuff required for clustering
in proxy/http.
cache ifdefs
-FIXME_NONMODULAR - this flaf needs to be turned on when compiling along
-with the entire TS. Turning this flag on should automatically turn the
-HTTP cache flag on.
FIXME_HOSTDB - Store ifdef to be turned off when HostDB stops using Store
FIXME_MGMT - Interface for warnings on the manager
FIXME_CLUSTER_ARGUMENTS - runtime arguments for clustering etc. Needs
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0b3367a8/lib/ts/ink_config.h.in
--
diff --git a/lib/ts/ink_config.h.in b/lib/ts/ink_config.h.in
index e158a2d..ba6fd53 100644
--- a/lib/ts/ink_config.h.in
+++ b/lib/ts/ink_config.h.in
@@ -92,7 +92,6 @@
# define TS_MAX_API_STATS @max_api_stats@
-# define FIXME_NONMODULAR 1
# define SPLIT_DNS 1
# define HTTP_CACHE 1
[33/50] git commit: Document the remap.config '.include' directive
Document the remap.config '.include' directive Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/8b6ab74d Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/8b6ab74d Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/8b6ab74d Branch: refs/heads/5.0.x Commit: 8b6ab74d6eb099674dc4d101297699459abcca65 Parents: 49111ee Author: James Peach jpe...@apache.org Authored: Fri Dec 6 16:36:14 2013 -0800 Committer: James Peach jpe...@apache.org Committed: Tue Dec 10 09:05:31 2013 -0800 -- doc/reference/configuration/remap.config.en.rst | 53 +++- 1 file changed, 52 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8b6ab74d/doc/reference/configuration/remap.config.en.rst -- diff --git a/doc/reference/configuration/remap.config.en.rst b/doc/reference/configuration/remap.config.en.rst index fa2713d..b6223da 100644 --- a/doc/reference/configuration/remap.config.en.rst +++ b/doc/reference/configuration/remap.config.en.rst @@ -284,7 +284,9 @@ Examples :: -map http://url/path http://url/path @plugin=/etc/traffic_server/config/plugins/plugin1.so @pparam=1 @pparam=2 @plugin=/etc/traffic_server/config/plugins/plugin2.so @pparam=3 +map http://url/path http://url/path \ +@plugin=/etc/traffic_server/config/plugins/plugin1.so @pparam=1 @pparam=2 \ +@plugin=/etc/traffic_server/config/plugins/plugin2.so @pparam=3 will pass 1 and 2 to plugin1.so and 3 to plugin2.so. @@ -324,3 +326,52 @@ The filter `disable_delete_purge` will be applied to all of the mapping rules. (It is activated before any mappings and is never deactivated.) The filter `internal_only` will only be applied to the second mapping. + +Including Additional Remap Files + + +The ``.include`` directive allows mapping rules to be spread across +multiple files. The argument to the ``.include`` directive is a +list of file names to be parsed for additional mapping rules. Unless +the names are absolute paths, they are resolved relative to the +Traffic Server configuration directory. + +The effect of the ``.include`` directive is as if the contents of +the listed files is included in the parent and parsing restarted +at the point of inclusion. This means that and filters named in the +included files are global in scope, and that additional ``.include`` +directives are allowed. + +.. note:: + + Included remap files are not currently tracked by the configuration + subsystem. Changes to included remap files will not be noticed + by online configuration changes applied by :option:`traffic_line + -x` unless :file:`remap.config` has also changed. + +Examples + + +In this example, a top-level :file:`remap.config` file simply +references additional mapping rules files :: + + .include filters.config + .include one.example.com.config two.example.com.config + +The file `filters.config` contains :: + + .definefilter deny_purge @action=deny @method=purge + .definefilter allow_purge @action=allow @method=purge + +The file `one.example.com.config` contains:: + + .activatefilter deny_purge + map http://one.example.com http://origin-one.example.com + .deactivatefilter deny_purge + +The file `two.example.com.config` contains:: + + .activatefilter allow_purge + map http://two.example.com http://origin-two.example.com + .deactivatefilter dallowpurge +
[26/50] git commit: TS-548: remove Initialize.cc Initialize.h
TS-548: remove Initialize.cc Initialize.h
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/707a5e7c
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/707a5e7c
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/707a5e7c
Branch: refs/heads/5.0.x
Commit: 707a5e7cfcbcbc7cd972eca75f6453fc21a8c03a
Parents: 0b3367a
Author: Zhao Yongming ming@gmail.com
Authored: Sat Dec 7 15:34:51 2013 +0800
Committer: Zhao Yongming ming@gmail.com
Committed: Sat Dec 7 15:35:25 2013 +0800
--
CHANGES | 2 +
proxy/Initialize.cc | 304 ---
proxy/Initialize.h | 57 -
3 files changed, 2 insertions(+), 361 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/707a5e7c/CHANGES
--
diff --git a/CHANGES b/CHANGES
index be9c8c7..2e1e7b6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 4.2.0
+ *) [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
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/707a5e7c/proxy/Initialize.cc
--
diff --git a/proxy/Initialize.cc b/proxy/Initialize.cc
deleted file mode 100644
index 54026ba..000
--- a/proxy/Initialize.cc
+++ /dev/null
@@ -1,304 +0,0 @@
-/** @file
-
- A brief file description
-
- @section license License
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- License); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an AS IS BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-/
-
- Initialize.cc --
- Created On : Fri Feb 5 18:22:05 1999
-
- Description:
- /
-#include libts.h
-
-#include Diags.h
-#include I_EventSystem.h
-#include I_Net.h
-#include I_Layout.h
-#include I_Version.h
-
-#include Initialize.h // TODO: move to I_Initialize.h ???
-#include ink_sys_control.h
-
-extern char* admin_user;
-
-//
-// Initialize operating system related information/services
-//
-void
-init_system_settings(void)
-{
- // Delimit file Descriptors
- fds_limit = ink_max_out_rlimit(RLIMIT_NOFILE, true, false);
-
- ink_max_out_rlimit(RLIMIT_STACK,true,true);
- ink_max_out_rlimit(RLIMIT_DATA,true,true);
- ink_max_out_rlimit(RLIMIT_FSIZE, true, false);
-#ifdef RLIMIT_RSS
- ink_max_out_rlimit(RLIMIT_RSS,true,true);
-#endif
-}
-
-#if defined(linux)
-#include sys/prctl.h
-#endif
-
-static int
-set_core_size(const char */* name ATS_UNUSED */, RecDataT /* data_type
ATS_UNUSED */, RecData data, void */* opaque_token ATS_UNUSED */)
-{
-
- RecInt size = data.rec_int;
- struct rlimit lim;
- bool failed = false;
-
- if (getrlimit(RLIMIT_CORE, lim) 0) {
-failed = true;
- } else {
-if (size 0) {
- lim.rlim_cur = lim.rlim_max;
-} else {
- lim.rlim_cur = (rlim_t) size;
-}
-if (setrlimit(RLIMIT_CORE, lim) 0) {
- failed = true;
-}
-#if defined(linux)
-#ifndef PR_SET_DUMPABLE
-#define PR_SET_DUMPABLE 4
-#endif
-if (size != 0)
- prctl(PR_SET_DUMPABLE, 1, 0, 0, 0);
-#endif
- }
-
- if (failed == true) {
-Warning(Failed to set Core Limit : %s, strerror(errno));
- }
- return 0;
-}
-
-void
-init_system_core_size(void)
-{
- bool found;
- RecInt coreSize;
- found = (RecGetRecordInt(proxy.config.core_limit, coreSize) ==
REC_ERR_OKAY);
- if (found == false) {
-Warning(Unable to determine core limit);
- } else {
-RecData rec_temp;
-rec_temp.rec_int = coreSize;
-set_core_size(NULL, RECD_INT, rec_temp, NULL);
-found = (REC_RegisterConfigUpdateFunc(proxy.config.core_limit,
set_core_size, NULL) == REC_ERR_OKAY);
-ink_assert(found);
- }
-}
-
-
-int system_syslog_facility = LOG_DAEMON;
-
-// Reads
[34/50] git commit: update regex remap docs
update regex remap docs Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/49111ee8 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/49111ee8 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/49111ee8 Branch: refs/heads/5.0.x Commit: 49111ee87aba994548cf06be7d4255719cefb2f7 Parents: a2c2ded Author: James Peach jpe...@apache.org Authored: Wed Dec 4 20:16:55 2013 -0800 Committer: James Peach jpe...@apache.org Committed: Tue Dec 10 09:05:31 2013 -0800 -- doc/reference/plugins/regex_remap.en.rst | 27 +++ 1 file changed, 15 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/49111ee8/doc/reference/plugins/regex_remap.en.rst -- diff --git a/doc/reference/plugins/regex_remap.en.rst b/doc/reference/plugins/regex_remap.en.rst index a98107b..0b8bb70 100644 --- a/doc/reference/plugins/regex_remap.en.rst +++ b/doc/reference/plugins/regex_remap.en.rst @@ -27,12 +27,15 @@ To use this plugin, configure a remap.config rule like :: map http://a.com http://b.com @plugin=regex_remap.so @pparam=maps.reg -The parameter with the file name is always required, and the regular -expressions within are evaluated sequentially from the first to the -last. When a regular expression is positively matched against a request -URL, evaluation is stopped and the rewrite rule is applied. If none of -the regular expressions are a match, the default destination URL is -applied (``http://b.com`` in the example above). +The file name parameter is always required. Unless an absolute path +is specified, the file name is assumed to be a path relative to the +Traffic Server configuration directory. + +The regular expressions listed in the configuration file are evaluated +sequentially. When a regular expression is positively matched against +a request URL, evaluation is stopped and the rewrite rule is applied. +If none of the regular expressions are a match, the default destination +URL is applied (``http://b.com`` in the example above). An optional argument (``@pparam``) with the string ``profile``\ will enable profiling of this regex remap rule, e.g. :: @@ -66,7 +69,6 @@ like :: GET/path?query=bar - The methods are always all upper-case, and always followed by one single space. There is no space between the method and the rest of the URL (or URI path). @@ -81,11 +83,6 @@ the option 'matrix-parameters', e.g. :: ... @pparam=maps.reg @pparam=matrix-parameters -The config file (``maps.reg`` above) can be placed anywhere, but unless -you specify an absolute path (as above), it will default to :: - -/usr/local/etc/regex_remap - A typical regex would look like :: ^/(ogre.*)/more http://www.ogre.com/$h/$0/$1 @@ -110,6 +107,12 @@ on the right hand side during evaluation :: $c - The cookie string from the request $i - The client IP for this request +.. note:: + +The ``$0`` substitution expands to the characters that were +matched by the regular expression, not to the entire string that +the regular expression was matched against. + You can also provide options, similar to how you configure your remap.config. The following options are available ::
[22/50] git commit: TS-2082: remove STANDALONE_IOCORE defines
TS-2082: remove STANDALONE_IOCORE defines Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/51ce9aec Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/51ce9aec Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/51ce9aec Branch: refs/heads/5.0.x Commit: 51ce9aec5fe8edb129c4cf1df29accdac35c5222 Parents: d6ab748 Author: Zhao Yongming ming@gmail.com Authored: Thu Nov 7 17:22:18 2013 +0800 Committer: Zhao Yongming ming@gmail.com Committed: Sat Dec 7 14:29:31 2013 +0800 -- Makefile.am| 6 ++ configure.ac | 27 +++ iocore/Makefile.am | 7 +-- iocore/aio/Makefile.am | 1 - iocore/cache/Makefile.am | 15 --- iocore/cluster/Makefile.am | 2 -- iocore/dns/DNS.cc | 2 -- iocore/dns/Makefile.am | 13 - iocore/eventsystem/Makefile.am | 1 - iocore/hostdb/Makefile.am | 13 - iocore/net/Makefile.am | 12 iocore/net/UnixNetProcessor.cc | 2 -- iocore/utils/Makefile.am | 2 -- lib/ts/ink_config.h.in | 6 +- proxy/Makefile.am | 14 -- 15 files changed, 7 insertions(+), 116 deletions(-) -- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/51ce9aec/Makefile.am -- diff --git a/Makefile.am b/Makefile.am index 0ececb4..0ad9b06 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,11 +28,9 @@ export CCACHE_BASEDIR # proxy/api/ts has to be built first, since so much of libraries and core # depends on the generates ts/ts.h include file. -if STANDALONE_IOCORE -SUBDIRS = proxy/api/ts iocore lib proxy/hdrs proxy/shared mgmt proxy plugins cmd tools example -else + SUBDIRS = proxy/api/ts iocore lib proxy/hdrs proxy/shared mgmt proxy rc doc plugins cmd tools example -endif + DIST_BUILD_USER=`id -nu` DIST_BUILD_USER_GROUP=`id -ng` http://git-wip-us.apache.org/repos/asf/trafficserver/blob/51ce9aec/configure.ac -- diff --git a/configure.ac b/configure.ac index c06c173..fd41a1b 100644 --- a/configure.ac +++ b/configure.ac @@ -228,30 +228,9 @@ AC_MSG_RESULT([$enable_micro]) AS_IF([test x$enable_micro = xyes], [is_micro_build=1], [is_micro_build=0]) AC_SUBST(is_micro_build) -# -# Standalone iocore -# -AC_MSG_CHECKING([whether to build a standalone iocore]) -AC_ARG_ENABLE([standalone-iocore], - [AS_HELP_STRING([--enable-standalone-iocore],[build just standalone iocore])], - [], - [enable_standalone_iocore=no] -) -AC_MSG_RESULT([$enable_standalone_iocore]) -TS_ARG_ENABLE_VAR([has],[standalone-iocore]) -AC_SUBST(has_standalone_iocore) -AS_IF([test 0 -ne $has_standalone_iocore], - [AC_SUBST([IOCORE_MODULARIZED_DEFS],[]) - AC_SUBST([ink_with_modules_def],[-DREC_BUILD_STAND_ALONE]) - AC_SUBST([ink_with_modules_local],[]) - AC_SUBST([ink_with_modules_process],[]) - ], - [AC_SUBST([ink_with_modules_def],[-DREC_BUILD_MGMT]) - AC_SUBST([ink_with_modules_local],[-DLOCAL_MANAGER]) - AC_SUBST([ink_with_modules_process],[-DPROCESS_MANAGER]) - ] -) -AM_CONDITIONAL([STANDALONE_IOCORE], [test 0 -ne $has_standalone_iocore]) +AC_SUBST([ink_with_modules_def],[-DREC_BUILD_MGMT]) +AC_SUBST([ink_with_modules_local],[-DLOCAL_MANAGER]) +AC_SUBST([ink_with_modules_process],[-DPROCESS_MANAGER]) # # Force some static linkage (for testing / development only) http://git-wip-us.apache.org/repos/asf/trafficserver/blob/51ce9aec/iocore/Makefile.am -- diff --git a/iocore/Makefile.am b/iocore/Makefile.am index 5178b56..cb597b6 100644 --- a/iocore/Makefile.am +++ b/iocore/Makefile.am @@ -16,9 +16,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -if STANDALONE_IOCORE -SUBDIRS = eventsystem net aio dns hostdb utils cache -else -SUBDIRS = eventsystem net aio dns hostdb utils cache cluster -endif - +SUBDIRS = eventsystem net aio dns hostdb utils cache cluster http://git-wip-us.apache.org/repos/asf/trafficserver/blob/51ce9aec/iocore/aio/Makefile.am -- diff --git a/iocore/aio/Makefile.am b/iocore/aio/Makefile.am index a19b04d..d270520 100644 --- a/iocore/aio/Makefile.am +++ b/iocore/aio/Makefile.am @@ -22,7 +22,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib/records \ -I$(top_srcdir)/lib/ts -DEFS += @IOCORE_MODULARIZED_DEFS@ TESTS = test_AIO.sample noinst_LIBRARIES = libinkaio.a http://git-wip-us.apache.org/repos/asf/trafficserver/blob/51ce9aec/iocore/cache/Makefile.am
[45/50] git commit: TS-2190: remove cache.log from the cacheurl plugin
TS-2190: remove cache.log from the cacheurl plugin
The information in the cacheurl plugin log is for debugging purposes,
but you can already get that from diagnostics. Remove the log file
since it's not really useful and it's better to have fewer logfiles.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/1410994d
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/1410994d
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/1410994d
Branch: refs/heads/5.0.x
Commit: 1410994d448d0352f705110a6c4efc9f947825ea
Parents: 6100526
Author: James Peach jpe...@apache.org
Authored: Tue Dec 10 21:00:39 2013 -0800
Committer: James Peach jpe...@apache.org
Committed: Wed Dec 11 16:00:15 2013 -0800
--
CHANGES | 2 ++
plugins/cacheurl/cacheurl.c | 36 ++--
2 files changed, 4 insertions(+), 34 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1410994d/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 30afc6c..22608c4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@
Changes with Apache Traffic Server 4.2.0
+ *) [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
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1410994d/plugins/cacheurl/cacheurl.c
--
diff --git a/plugins/cacheurl/cacheurl.c b/plugins/cacheurl/cacheurl.c
index 1779bae..3b3e98d 100644
--- a/plugins/cacheurl/cacheurl.c
+++ b/plugins/cacheurl/cacheurl.c
@@ -57,8 +57,6 @@ typedef struct {
//pr_list *next; /* Link to next set of patterns, if any */
} pr_list;
-static TSTextLogObject log = NULL;
-
static int regex_substitute(char **buf, char *str, regex_info *info) {
int matchcount;
int ovector[OVECOUNT]; /* Locations of matches in regex */
@@ -261,13 +259,7 @@ static pr_list* load_config_file(const char *config_file) {
/* We have the pattern/replacement, now do precompilation.
* buffer is the first part of the line. spend is the second part just
* after the whitespace */
-if (log) {
-TSTextLogObjectWrite(log,
-Adding pattern/replacement pair: '%s' - '%s',
-buffer, spend);
-}
-TSDebug(PLUGIN_NAME, Adding pattern/replacement pair: '%s' - '%s'\n,
-buffer, spend);
+TSDebug(PLUGIN_NAME, Adding pattern/replacement pair: '%s' - '%s',
buffer, spend);
retval = regex_compile(info, buffer, spend);
if (!retval) {
TSError([%s] Error precompiling regex/replacement. Skipping.\n,
@@ -319,13 +311,7 @@ static int rewrite_cacheurl(pr_list *prl, TSHttpTxn txnp) {
i++;
}
if (newurl) {
-if (log) {
-TSTextLogObjectWrite(log,
-Rewriting cache URL for %s to %s, url,
-newurl);
-}
-TSDebug(PLUGIN_NAME, Rewriting cache URL for %s to %s\n,
-url, newurl);
+TSDebug(PLUGIN_NAME, Rewriting cache URL for %s to %s, url,
newurl);
if (TSCacheUrlSet(txnp, newurl, strlen(newurl))
!= TS_SUCCESS) {
TSError([%s] Unable to modify cache url from
@@ -391,16 +377,6 @@ TSReturnCode TSRemapInit(TSRemapInterface *api_info, char
*errbuf,
return TS_ERROR;
}
-if (!log) {
-error = TSTextLogObjectCreate(cacheurl, TS_LOG_MODE_ADD_TIMESTAMP,
-log);
-if (!log || error == TS_ERROR) {
-snprintf(errbuf, errbuf_size - 1,
-[%s] Error creating log file\n, PLUGIN_NAME);
-return TS_ERROR;
-}
-}
-
TSDebug(PLUGIN_NAME, remap plugin is successfully initialized);
return TS_SUCCESS;
}
@@ -453,14 +429,6 @@ void TSPluginInit(int argc, const char *argv[]) {
return;
}
-if (!log) {
-error = TSTextLogObjectCreate(cacheurl, TS_LOG_MODE_ADD_TIMESTAMP,
-log);
-if (!log || error == TS_ERROR) {
-TSError([%s] Error creating log file\n, PLUGIN_NAME);
-}
-}
-
prl = load_config_file(argc 1 ? argv[1] : NULL);
contp = TSContCreate((TSEventFunc)handle_hook, NULL);
[48/50] git commit: [TS-1449] Update Doc to match actual default
[TS-1449] Update Doc to match actual default Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/3388fd8c Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/3388fd8c Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/3388fd8c Branch: refs/heads/5.0.x Commit: 3388fd8cca6a22b3217ee361fdd0b83459500fce Parents: 7244c89 Author: Miles Libbey mlib...@apache.org Authored: Thu Dec 12 14:51:16 2013 -0800 Committer: Miles Libbey mlib...@apache.org Committed: Thu Dec 12 14:51:16 2013 -0800 -- doc/reference/configuration/records.config.en.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3388fd8c/doc/reference/configuration/records.config.en.rst -- diff --git a/doc/reference/configuration/records.config.en.rst b/doc/reference/configuration/records.config.en.rst index 9d9cb39..1f45a7a 100644 --- a/doc/reference/configuration/records.config.en.rst +++ b/doc/reference/configuration/records.config.en.rst @@ -1525,7 +1525,7 @@ Logging Configuration The maximum amount of time before data in the buffer is flushed to disk. -.. ts:cv:: CONFIG proxy.config.log.max_space_mb_for_logs INT 2000 +.. ts:cv:: CONFIG proxy.config.log.max_space_mb_for_logs INT 2500 :metric: megabytes :reloadable:
[50/50] git commit: Fix merge conflict
Fix merge conflict Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/93e7027b Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/93e7027b Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/93e7027b Branch: refs/heads/5.0.x Commit: 93e7027b4a3240f7bc956e353efd0c8b429ccfd3 Parents: d6a7a9c Author: Leif Hedstrom zw...@apache.org Authored: Sat Dec 14 14:46:19 2013 -0700 Committer: Leif Hedstrom zw...@apache.org Committed: Sat Dec 14 14:46:19 2013 -0700 -- CHANGES | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/93e7027b/CHANGES -- diff --git a/CHANGES b/CHANGES index f9672d9..c6dfb60 100644 --- a/CHANGES +++ b/CHANGES @@ -5,6 +5,8 @@ Changes with Apache Traffic Server 5.0.0 compatibility, so all cluster nodes should be upgraded simultaneously. +Changes with Apache Traffic Server 4.2.0 + *) [TS-2251] Simplify LogBuffer reference counting. *) [TS-2190] Remove cache.log from the cachurl plugin. @@ -92,11 +94,7 @@ Changes with Apache Traffic Server 5.0.0 *) [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 b13621367...@gmail.com
[24/50] git commit: add TS-2082
add TS-2082 Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/db8052d5 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/db8052d5 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/db8052d5 Branch: refs/heads/5.0.x Commit: db8052d5760fb1882057561b8e4250b6939235df Parents: 5140b18 Author: Zhao Yongming ming@gmail.com Authored: Sat Dec 7 14:57:00 2013 +0800 Committer: Zhao Yongming ming@gmail.com Committed: Sat Dec 7 14:57:00 2013 +0800 -- CHANGES | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/db8052d5/CHANGES -- diff --git a/CHANGES b/CHANGES index eca1bad..6745047 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 4.2.0 + *) [TS-2082] remove STANDALONE_IOCORE 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 @@ -96,8 +98,6 @@ Changes with Apache Traffic Server 4.2.0 *) [TS-2303] Incorrect docs for negative_caching_enabled. Author: Thomas Jackson jacksontj...@gmail.com - *) [TS-2082] fix build with --enable-standalone-iocore. - *) [TS-2712] Explicitly use subdir-objects in automake init. *) [TS-2309] Allow mod_generator plugin for lighttpd to accept SI postfixes.
[18/50] git commit: TS-1146: fix the CentOS5 build
TS-1146: fix the CentOS5 build
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/a10b8090
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/a10b8090
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/a10b8090
Branch: refs/heads/5.0.x
Commit: a10b8090fcb1dc8fa745df9b12d15596ec76cc4d
Parents: 358e926
Author: James Peach jpe...@apache.org
Authored: Fri Dec 6 16:09:43 2013 -0800
Committer: James Peach jpe...@apache.org
Committed: Fri Dec 6 16:09:43 2013 -0800
--
iocore/net/SSLUtils.cc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a10b8090/iocore/net/SSLUtils.cc
--
diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc
index f7b5f4b..686194b 100644
--- a/iocore/net/SSLUtils.cc
+++ b/iocore/net/SSLUtils.cc
@@ -70,6 +70,9 @@ typedef SSL_METHOD * ink_ssl_method_t;
#endif
#if TS_USE_TLS_TICKETS
+static int ssl_callback_session_ticket(SSL *, unsigned char *, unsigned char
*, EVP_CIPHER_CTX *, HMAC_CTX *, int);
+#endif /* TS_USE_TLS_TICKETS */
+
struct ssl_ticket_key_t
{
unsigned char key_name[16];
@@ -77,10 +80,7 @@ struct ssl_ticket_key_t
unsigned char aes_key[16];
};
-static int ssl_callback_session_ticket(SSL *, unsigned char *, unsigned char
*, EVP_CIPHER_CTX *, HMAC_CTX *, int);
static int ssl_session_ticket_index = 0;
-#endif /* TS_USE_TLS_TICKETS */
-
static ProxyMutex ** sslMutexArray;
static bool open_ssl_initialized = false;
[44/50] git commit: doc: link hostdb proposal
doc: link hostdb proposal Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/61005266 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/61005266 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/61005266 Branch: refs/heads/5.0.x Commit: 610052660e2a75014b7fafcc794cf723d966d5f0 Parents: ab57e59 Author: James Peach jpe...@apache.org Authored: Tue Dec 10 12:32:16 2013 -0800 Committer: James Peach jpe...@apache.org Committed: Tue Dec 10 12:32:16 2013 -0800 -- doc/arch/index.en.rst | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/61005266/doc/arch/index.en.rst -- diff --git a/doc/arch/index.en.rst b/doc/arch/index.en.rst index 5f21f8b..51f5b83 100644 --- a/doc/arch/index.en.rst +++ b/doc/arch/index.en.rst @@ -31,3 +31,4 @@ Contents: :maxdepth: 2 cache/cache.en + proposals/hostdb.en
[14/50] git commit: Another typo fix
Another typo fix Last code part was not well formatted. Sorry for missing it at first time Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/82ad4efc Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/82ad4efc Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/82ad4efc Branch: refs/heads/5.0.x Commit: 82ad4efcc899c9cf570cc143981c706f257a9893 Parents: eaaf889 Author: Jean Baptiste Favre git...@jbfavre.org Authored: Fri Dec 6 22:19:22 2013 +0100 Committer: Jean Baptiste Favre git...@jbfavre.org Committed: Fri Dec 6 22:19:22 2013 +0100 -- .../sample-buffered-null-transformation-plugin.en.rst| 8 1 file changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/82ad4efc/doc/sdk/http-transformation-plugin/sample-buffered-null-transformation-plugin.en.rst -- diff --git a/doc/sdk/http-transformation-plugin/sample-buffered-null-transformation-plugin.en.rst b/doc/sdk/http-transformation-plugin/sample-buffered-null-transformation-plugin.en.rst index 866eb61..f1e1b3a 100644 --- a/doc/sdk/http-transformation-plugin/sample-buffered-null-transformation-plugin.en.rst +++ b/doc/sdk/http-transformation-plugin/sample-buffered-null-transformation-plugin.en.rst @@ -193,11 +193,11 @@ transform: #. The ``handle_output`` function writes the buffer to the output vconnection: -.. code-block:: c + .. code-block:: c - data-output_vio = - TSVConnWrite (output_conn, contp, data-output_reader, - TSIOBufferReaderAvail (data-output_reader) ); + data-output_vio = + TSVConnWrite (output_conn, contp, data-output_reader, + TSIOBufferReaderAvail (data-output_reader) ); The following diagram illustrates the write to the output vconnection:
[05/50] git commit: TS-2401: Add RecConfigReadLogDir() to wrap proxy.config.log.logfile_dir access
TS-2401: Add RecConfigReadLogDir() to wrap proxy.config.log.logfile_dir access
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/a1162d83
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/a1162d83
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/a1162d83
Branch: refs/heads/5.0.x
Commit: a1162d8368a3f6a3401a31983ac90181f5a11782
Parents: b6288c4
Author: James Peach jpe...@apache.org
Authored: Tue Dec 3 13:25:11 2013 -0800
Committer: James Peach jpe...@apache.org
Committed: Thu Dec 5 20:33:49 2013 -0800
--
lib/records/I_RecCore.h | 4
lib/records/RecCore.cc | 17 +
proxy/InkAPITest.cc | 5 ++---
proxy/logging/LogConfig.cc | 12 ++--
proxy/shared/DiagsConfig.cc | 9 +
5 files changed, 26 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a1162d83/lib/records/I_RecCore.h
--
diff --git a/lib/records/I_RecCore.h b/lib/records/I_RecCore.h
index 8462752..39d2e9d 100644
--- a/lib/records/I_RecCore.h
+++ b/lib/records/I_RecCore.h
@@ -53,6 +53,10 @@ char * RecConfigReadRuntimeDir();
// MUST release the result with ats_free().
char * RecConfigReadSnapshotDir();
+// Return a copy of the system's log directory, taking
proxy.config.log.logfile_dir into account. The caller
+// MUST release the result with ats_free().
+char * RecConfigReadLogDir();
+
// Return a copy of a configuration file that is relative to sysconfdir. The
relative path to the configuration
// file is specified in the configuration variable named by file_variable.
If the configuration variable has no
// value, NULL is returned. The caller MUST release the result with ats_free().
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a1162d83/lib/records/RecCore.cc
--
diff --git a/lib/records/RecCore.cc b/lib/records/RecCore.cc
index 6c17cc9..96cddfc 100644
--- a/lib/records/RecCore.cc
+++ b/lib/records/RecCore.cc
@@ -1071,6 +1071,23 @@ RecConfigReadRuntimeDir()
}
//-
+// RecConfigReadLogDir
+//-
+char *
+RecConfigReadLogDir()
+{
+ char buf[PATH_NAME_MAX + 1];
+
+ buf[0] = '\0';
+ RecGetRecordString(proxy.config.log.logfile_dir, buf, PATH_NAME_MAX);
+ if (strlen(buf) 0) {
+return Layout::get()-relative(buf);
+ } else {
+return ats_strdup(Layout::get()-logdir);
+ }
+}
+
+//-
// RecConfigReadSnapshotDir.
//-
char *
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a1162d83/proxy/InkAPITest.cc
--
diff --git a/proxy/InkAPITest.cc b/proxy/InkAPITest.cc
index 3e0ce3a..8f97a88 100644
--- a/proxy/InkAPITest.cc
+++ b/proxy/InkAPITest.cc
@@ -5340,10 +5340,9 @@ REGRESSION_TEST(SDK_API_TSTextLog) (RegressionTest *
test, int /* atype ATS_UNUS
/* Generate a random log file name, so if we run the test several times, we
won't use the
same log file name. */
- char *tmp = REC_ConfigReadString(proxy.config.log.logfile_dir);
+ xptrchar tmp(RecConfigReadLogDir());
snprintf(logname, sizeof(logname), RegressionTestLog%d.log, (int)
getpid());
- snprintf(fullpath_logname, sizeof(fullpath_logname), %s/%s, tmp, logname);
- // ats_free(tmp);
+ snprintf(fullpath_logname, sizeof(fullpath_logname), %s/%s, (const char
*)tmp, logname);
unlink(fullpath_logname);
retVal = TSTextLogObjectCreate(logname, TS_LOG_MODE_ADD_TIMESTAMP, log);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a1162d83/proxy/logging/LogConfig.cc
--
diff --git a/proxy/logging/LogConfig.cc b/proxy/logging/LogConfig.cc
index 5810e8f..133ea21 100644
--- a/proxy/logging/LogConfig.cc
+++ b/proxy/logging/LogConfig.cc
@@ -240,16 +240,8 @@ LogConfig::read_configuration_variables()
hostname = ptr;
}
- ptr = REC_ConfigReadString(proxy.config.log.logfile_dir);
- if (ptr != NULL) {
-ats_free(logfile_dir);
-// Make it relative from Layout
-logfile_dir = Layout::get()-relative(ptr);
-ats_free(ptr);
- } else {
-ats_free(logfile_dir);
-logfile_dir = ats_strdup(Layout::get()-logdir);
- }
+ ats_free(logfile_dir);
+ logfile_dir = RecConfigReadLogDir();
if (access(logfile_dir, R_OK | W_OK | X_OK) == -1) {
// Try 'system_root_dir/var/log/trafficserver' directory
[21/50] git commit: TS-312: Add option to always share keep-alive connections to the origin server
TS-312: Add option to always share keep-alive connections to the origin server
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/d6ab7482
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/d6ab7482
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/d6ab7482
Branch: refs/heads/5.0.x
Commit: d6ab7482489be6b79d911f55564afb707c7004d6
Parents: 960c3f8
Author: Bryan Call bc...@apache.org
Authored: Fri Dec 6 17:04:50 2013 -0800
Committer: Bryan Call bc...@apache.org
Committed: Fri Dec 6 17:04:50 2013 -0800
--
CHANGES | 2 ++
mgmt/RecordsConfig.cc| 2 ++
proxy/http/HttpConfig.cc | 1 +
proxy/http/HttpConfig.h | 1 +
proxy/http/HttpSM.cc | 16 +++-
5 files changed, 13 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d6ab7482/CHANGES
--
diff --git a/CHANGES b/CHANGES
index cacc5ad..eca1bad 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 4.2.0
+ *) [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.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d6ab7482/mgmt/RecordsConfig.cc
--
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index a54e018..bf3674e 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -456,6 +456,8 @@ RecordElement RecordsConfig[] = {
,
{RECT_CONFIG, proxy.config.http.origin_min_keep_alive_connections,
RECD_INT, 0, RECU_DYNAMIC, RR_NULL, RECC_STR, ^[0-9]+$, RECA_NULL}
,
+ {RECT_CONFIG, proxy.config.http.attach_sever_session_to_client, RECD_INT,
0, RECU_DYNAMIC, RR_NULL, RECC_INT, [0-1], RECA_NULL}
+ ,
// ##
// # HTTP referer filtering #
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d6ab7482/proxy/http/HttpConfig.cc
--
diff --git a/proxy/http/HttpConfig.cc b/proxy/http/HttpConfig.cc
index 3c8109d..d36b3cc 100644
--- a/proxy/http/HttpConfig.cc
+++ b/proxy/http/HttpConfig.cc
@@ -1145,6 +1145,7 @@ HttpConfig::startup()
HttpEstablishStaticConfigLongLong(c.oride.server_tcp_init_cwnd,
proxy.config.http.server_tcp_init_cwnd);
HttpEstablishStaticConfigLongLong(c.oride.origin_max_connections,
proxy.config.http.origin_max_connections);
HttpEstablishStaticConfigLongLong(c.origin_min_keep_alive_connections,
proxy.config.http.origin_min_keep_alive_connections);
+ HttpEstablishStaticConfigLongLong(c.attach_server_session_to_client,
proxy.config.http.attach_server_session_to_client);
HttpEstablishStaticConfigByte(c.parent_proxy_routing_enable,
proxy.config.http.parent_proxy_routing_enable);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d6ab7482/proxy/http/HttpConfig.h
--
diff --git a/proxy/http/HttpConfig.h b/proxy/http/HttpConfig.h
index 033ee7f..a663e2f 100644
--- a/proxy/http/HttpConfig.h
+++ b/proxy/http/HttpConfig.h
@@ -640,6 +640,7 @@ public:
MgmtInt server_max_connections;
MgmtInt origin_min_keep_alive_connections; // TODO: This one really ought to
be overridable, but difficult right now.
+ MgmtInt attach_server_session_to_client;
MgmtByte parent_proxy_routing_enable;
MgmtByte disable_ssl_parenting;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d6ab7482/proxy/http/HttpSM.cc
--
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index 503ac9b..1ae8615 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -2934,15 +2934,13 @@ HttpSM::tunnel_handler_server(int event,
HttpTunnelProducer * p)
server_session-server_trans_stat--;
HTTP_DECREMENT_DYN_STAT(http_current_server_transactions_stat);
-// If the client is still around, attach the server session
-// to so the next ka request can use it. We bind privately to the
-// client to add some degree of affinity to the system. However,
-// we turn off private binding when outbound connections are being
-// limit since it makes it too expensive to initiate a purge of idle
-// server keep-alive sessions
-if (ua_session t_state.client_info.keep_alive == HTTP_KEEPALIVE
-t_state.http_config_param-server_max_connections = 0
-t_state.txn_conf-origin_max_connections
[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 -
[35/50] git commit: doc: fix various sphinx syntax errors
doc: fix various sphinx syntax errors Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/5e256d25 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/5e256d25 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/5e256d25 Branch: refs/heads/5.0.x Commit: 5e256d253eeb3554cd942f8349032deb4b9c8afa Parents: 8b6ab74 Author: James Peach jpe...@apache.org Authored: Sat Dec 7 19:59:15 2013 -0800 Committer: James Peach jpe...@apache.org Committed: Tue Dec 10 09:19:35 2013 -0800 -- doc/reference/plugins/balancer.en.rst | 18 ++ doc/reference/plugins/index.en.rst| 4 ++-- 2 files changed, 8 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5e256d25/doc/reference/plugins/balancer.en.rst -- diff --git a/doc/reference/plugins/balancer.en.rst b/doc/reference/plugins/balancer.en.rst index 4fba905..43aa3ed 100644 --- a/doc/reference/plugins/balancer.en.rst +++ b/doc/reference/plugins/balancer.en.rst @@ -24,18 +24,16 @@ Balancer Plugin This is a plugin for Traffic Server, that allows you to configure mapping rules. -To use this plugin, configure a remap.config rule like +To use this plugin, configure a remap.config rule like this:: -:: map http://foo.com http://bar.com @plugin=balancer.so @pparam=rotation:news The To-Url in the remap.config rule is generally not used, unless the lookup completely fails (i.e. this is a backup URL for extreme error cases). -This is a list of all available options (set via @pparam): +This is a list of all available options (set via @pparam):: -:: rotation The name of the rotation (e.g. news) [to-host in remap] hash What to hash on, url, path, cookie, ip, header (primary) hash2 Optional, secondary hash, to hash within a multi-host bucket @@ -46,28 +44,24 @@ not specified, we will default to the same name as used in the To URL in the remap rule. The bucket width specifies how many hosts a particular hash bucket -should contain, for example: +should contain, for example:: -:: @pparam=bucketw:2 The hash parameter can be used zero or more times, without it, no hashing is done at all. If you have more than one hash keys, they are -concatenated in the order specified. For example: +concatenated in the order specified. For example:: -:: @pparam=hash:ip @pparam=hash:cookie/B -The header hash key takes a required extra value, for example: +The header hash key takes a required extra value, for example:: -:: @pparam=hash:header/Host For cookie hash keys, you can optionally specify an identifier for which cookie to use (without it, the entire cookie header is used). For -example: +example:: -:: @pparam=hash:cookie/B The secondary hash (hash2) is used to provide stickiness within a http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5e256d25/doc/reference/plugins/index.en.rst -- diff --git a/doc/reference/plugins/index.en.rst b/doc/reference/plugins/index.en.rst index 875b325..4001acc 100644 --- a/doc/reference/plugins/index.en.rst +++ b/doc/reference/plugins/index.en.rst @@ -51,8 +51,8 @@ Experimental plugins Plugins that are considered experimental are located in the -```plugins/experimental`` https://git-wip-us.apache.org/repos/asf?p=trafficserver.git;a=tree;f=plugins/experimental;hb=HEAD`_ -directory in the Apache Traffic Server source tree. Exmperimental plugins can be compiled by passing the +`plugins/experimental https://git-wip-us.apache.org/repos/asf?p=trafficserver.git;a=tree;f=plugins/experimental;hb=HEAD`_ +directory of the Apache Traffic Server source tree. Exmperimental plugins can be compiled by passing the `--enable-experimental-plugins` option to `configure`:: $ autoconf -i
[36/50] git commit: TS-2426: add the xdebug plugin
TS-2426: add the xdebug plugin The xdebug plugin scans X-Debug header values and emits the requested debug information. The plugin is named after the X- prefix of the headers that is scans and emits. The values we scan for are names of debug headers. The first header to be supported is X-Cache-Key, which report the cache lookup URL used buy the request. the second header supported is the Via header, which causes a verbose Via header to be emitted for the request. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/14667c65 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/14667c65 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/14667c65 Branch: refs/heads/5.0.x Commit: 14667c65ff72d6af5da9bec62c41548076093091 Parents: 5e256d2 Author: James Peach jpe...@apache.org Authored: Tue Dec 3 15:03:36 2013 -0800 Committer: James Peach jpe...@apache.org Committed: Tue Dec 10 09:26:51 2013 -0800 -- CHANGES | 3 + configure.ac | 1 + plugins/experimental/Makefile.am | 23 +-- plugins/experimental/xdebug/xdebug.cc | 217 + 4 files changed, 234 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/14667c65/CHANGES -- diff --git a/CHANGES b/CHANGES index 49488e9..30afc6c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 4.2.0 + + *) [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). http://git-wip-us.apache.org/repos/asf/trafficserver/blob/14667c65/configure.ac -- diff --git a/configure.ac b/configure.ac index fd41a1b..c16f89f 100644 --- a/configure.ac +++ b/configure.ac @@ -1935,6 +1935,7 @@ AC_CONFIG_FILES([ plugins/experimental/tcp_info/Makefile plugins/experimental/healthchecks/Makefile plugins/experimental/remap_stats/Makefile + plugins/experimental/xdebug/Makefile plugins/gzip/Makefile plugins/libloader/Makefile plugins/header_filter/Makefile http://git-wip-us.apache.org/repos/asf/trafficserver/blob/14667c65/plugins/experimental/Makefile.am -- diff --git a/plugins/experimental/Makefile.am b/plugins/experimental/Makefile.am index b0e4d98..3d5a453 100644 --- a/plugins/experimental/Makefile.am +++ b/plugins/experimental/Makefile.am @@ -15,19 +15,22 @@ # limitations under the License. if BUILD_EXPERIMENTAL_PLUGINS + SUBDIRS = \ - lua \ - ts_lua \ + authproxy \ buffer_upload \ - esi \ - rfc5861 \ - tcp_info \ - custom_redirect \ - metalink \ - spdy \ channel_stats \ - authproxy \ + custom_redirect \ + esi \ geoip_acl \ healthchecks \ - remap_stats + lua \ + metalink \ + remap_stats \ + rfc5861 \ + spdy \ + tcp_info \ + ts_lua \ + xdebug + endif http://git-wip-us.apache.org/repos/asf/trafficserver/blob/14667c65/plugins/experimental/xdebug/xdebug.cc -- diff --git a/plugins/experimental/xdebug/xdebug.cc b/plugins/experimental/xdebug/xdebug.cc new file mode 100644 index 000..e33ffa3 --- /dev/null +++ b/plugins/experimental/xdebug/xdebug.cc @@ -0,0 +1,217 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include ts/ts.h +#include stdlib.h +#include strings.h + +// The name of the debug request header. This should probably be configurable. +#define X_DEBUG_HEADER X-Debug + +#define XHEADER_X_CACHE_KEY 0x0004u + +static int XArgIndex = 0; +static TSCont XInjectHeadersCont = NULL; + +// Return the length of a string literal. +template int N unsigned
[15/50] git commit: TS-1146: consistently apply 2char indentation
TS-1146: consistently apply 2char indentation
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/0850f4c3
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/0850f4c3
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/0850f4c3
Branch: refs/heads/5.0.x
Commit: 0850f4c3a833a76779be65b769fc0e239e6fc93f
Parents: eaaf889
Author: James Peach jpe...@apache.org
Authored: Fri Dec 6 14:38:40 2013 -0800
Committer: James Peach jpe...@apache.org
Committed: Fri Dec 6 14:39:10 2013 -0800
--
iocore/net/SSLUtils.cc | 141 ++--
1 file changed, 71 insertions(+), 70 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0850f4c3/iocore/net/SSLUtils.cc
--
diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc
index a958b4a..ce1d383 100644
--- a/iocore/net/SSLUtils.cc
+++ b/iocore/net/SSLUtils.cc
@@ -50,9 +50,9 @@
#ifndef evp_md_func
#ifdef OPENSSL_NO_SHA256
-#define evp_md_func EVP_sha1()
+#define evp_md_func EVP_sha1()
#else
-#define evp_md_func EVP_sha256()
+#define evp_md_func EVP_sha256()
#endif
#endif
@@ -64,9 +64,9 @@ typedef SSL_METHOD * ink_ssl_method_t;
struct ssl_ticket_key_t
{
-unsigned char key_name[16];
-unsigned char hmac_secret[16];
-unsigned char aes_key[16];
+ unsigned char key_name[16];
+ unsigned char hmac_secret[16];
+ unsigned char aes_key[16];
};
static ProxyMutex ** sslMutexArray;
@@ -76,24 +76,24 @@ static int ssl_session_ticket_index = 0;
struct ats_file_bio
{
-ats_file_bio(const char * path, const char * mode)
- : bio(BIO_new_file(path, mode)) {
-}
+ ats_file_bio(const char * path, const char * mode)
+: bio(BIO_new_file(path, mode)) {
+ }
-~ats_file_bio() {
-(void)BIO_set_close(bio, BIO_CLOSE);
-BIO_free(bio);
-}
+ ~ats_file_bio() {
+(void)BIO_set_close(bio, BIO_CLOSE);
+BIO_free(bio);
+ }
-operator bool() const {
-return bio != NULL;
-}
+ operator bool() const {
+return bio != NULL;
+ }
-BIO * bio;
+ BIO * bio;
private:
-ats_file_bio(const ats_file_bio);
-ats_file_bio operator=(const ats_file_bio);
+ ats_file_bio(const ats_file_bio);
+ ats_file_bio operator=(const ats_file_bio);
};
static unsigned long
@@ -238,13 +238,13 @@ ssl_context_enable_tickets(SSL_CTX * ctx, const char *
ticket_key_path)
ticket_key_data = readIntoBuffer(ticket_key_path, __func__, ticket_key_len);
if (!ticket_key_data) {
- Error(failed to read SSL session ticket key from %s, (const char
*)ticket_key_path);
- goto fail;
+Error(failed to read SSL session ticket key from %s, (const char
*)ticket_key_path);
+goto fail;
}
if (ticket_key_len 48) {
- Error(SSL session ticket key from %s is too short (48 bytes are
required), (const char *)ticket_key_path);
- goto fail;
+Error(SSL session ticket key from %s is too short (48 bytes are
required), (const char *)ticket_key_path);
+goto fail;
}
ticket_key = NEW(new ssl_ticket_key_t());
@@ -256,13 +256,13 @@ ssl_context_enable_tickets(SSL_CTX * ctx, const char *
ticket_key_path)
// SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB constant. we set the callback first
// so that we don't leave a ticket_key pointer attached if it fails.
if (SSL_CTX_set_tlsext_ticket_key_cb(ctx, ssl_callback_session_ticket) == 0)
{
- Error(failed to set session ticket callback);
- goto fail;
+Error(failed to set session ticket callback);
+goto fail;
}
if (SSL_CTX_set_ex_data(ctx, ssl_session_ticket_index, ticket_key) == 0) {
- Error (failed to set session ticket data to ctx);
- goto fail;
+Error (failed to set session ticket data to ctx);
+goto fail;
}
SSL_CTX_clear_options(ctx, SSL_OP_NO_TICKET);
@@ -581,12 +581,12 @@ fail:
static char *
asn1_strdup(ASN1_STRING * s)
{
-// Make sure we have an 8-bit encoding.
-ink_assert(ASN1_STRING_type(s) == V_ASN1_IA5STRING ||
- ASN1_STRING_type(s) == V_ASN1_UTF8STRING ||
- ASN1_STRING_type(s) == V_ASN1_PRINTABLESTRING);
+ // Make sure we have an 8-bit encoding.
+ ink_assert(ASN1_STRING_type(s) == V_ASN1_IA5STRING ||
+ASN1_STRING_type(s) == V_ASN1_UTF8STRING ||
+ASN1_STRING_type(s) == V_ASN1_PRINTABLESTRING);
-return ats_strndup((const char *)ASN1_STRING_data(s),
ASN1_STRING_length(s));
+ return ats_strndup((const char *)ASN1_STRING_data(s), ASN1_STRING_length(s));
}
// Given a certificate and it's corresponding SSL_CTX context, insert hash
@@ -686,8 +686,8 @@ ssl_store_ssl_context(
// Session tickets are enabled by default. Disable if explicitly requested.
if (session_ticket_enabled == 0) {
-
[28/50] git commit: Bump sphinx docs version to match autoconf
Bump sphinx docs version to match autoconf Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/b57a8095 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/b57a8095 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/b57a8095 Branch: refs/heads/5.0.x Commit: b57a80952416ba7edba13d03b402e77c53733515 Parents: a2de1c0 Author: James Peach jpe...@apache.org Authored: Sat Dec 7 20:32:56 2013 -0800 Committer: James Peach jpe...@apache.org Committed: Sat Dec 7 20:32:56 2013 -0800 -- doc/conf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b57a8095/doc/conf.py -- diff --git a/doc/conf.py b/doc/conf.py index 6b19426..43c8f1b 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -69,9 +69,9 @@ copyright = u'2013, d...@trafficserver.apache.org' # update a reasonable version number here. # # The short X.Y version. -version = '4.1' +version = '4.2' # The full version, including alpha/beta/rc tags. -release = '4.1.x' +release = '4.2.x' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.
[02/50] git commit: TS-2401: Replace system_root_dir with Layout::prefix
TS-2401: Replace system_root_dir with Layout::prefix
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/fa100cff
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/fa100cff
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/fa100cff
Branch: refs/heads/5.0.x
Commit: fa100cffa77b33c723ad0236876477a3c054bac1
Parents: bb26f42
Author: James Peach jpe...@apache.org
Authored: Wed Nov 27 14:50:48 2013 -0800
Committer: James Peach jpe...@apache.org
Committed: Thu Dec 5 20:33:48 2013 -0800
--
example/app-template/app-template.cc | 8 +++-
iocore/hostdb/HostDB.cc | 2 +-
lib/records/I_RecDefs.h | 1 -
mgmt/Main.cc | 9 -
proxy/InkAPI.cc | 2 +-
proxy/Main.cc| 10 +-
proxy/logging/LogStandalone.cc | 1 -
7 files changed, 14 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fa100cff/example/app-template/app-template.cc
--
diff --git a/example/app-template/app-template.cc
b/example/app-template/app-template.cc
index d4d63cd..fefff13 100644
--- a/example/app-template/app-template.cc
+++ b/example/app-template/app-template.cc
@@ -53,7 +53,6 @@ int system_num_of_processors = ink_number_of_processors();
int system_num_of_net_threads = DEFAULT_NUMBER_OF_THREADS;
int system_num_of_udp_threads = DEFAULT_NUMBER_OF_UDP_THREADS;
-char system_root_dir[PATH_NAME_MAX + 1];
char system_runtime_dir[PATH_NAME_MAX + 1];
char system_config_directory[PATH_NAME_MAX + 1];
char system_log_dir[PATH_NAME_MAX + 1];
@@ -158,17 +157,16 @@ int main(int argc, char * argv[])
}
// Get TS directories
- ink_strlcpy(system_root_dir, Layout::get()-prefix, sizeof(system_root_dir));
ink_strlcpy(system_config_directory, Layout::get()-sysconfdir,
sizeof(system_config_directory));
ink_strlcpy(system_runtime_dir, Layout::get()-runtimedir,
sizeof(system_runtime_dir));
ink_strlcpy(system_log_dir, Layout::get()-logdir, sizeof(system_log_dir));
- if (system_root_dir[0] (chdir(system_root_dir) 0)) {
-fprintf(stderr,unable to change to root directory \%s\ [%d '%s']\n,
system_root_dir, errno, strerror(errno));
+ if (chdir(Layout::get()-prefix) 0) {
+fprintf(stderr,unable to change to root directory \%s\ [%d '%s']\n,
Layout::get()-prefix, errno, strerror(errno));
fprintf(stderr, please set correct path in env variable TS_ROOT \n);
_exit(1);
} else {
-printf([tsapp] using root directory '%s'\n,system_root_dir);
+printf([tsapp] using root directory '%s'\n, Layou::get()-prefix);
}
// Diags
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fa100cff/iocore/hostdb/HostDB.cc
--
diff --git a/iocore/hostdb/HostDB.cc b/iocore/hostdb/HostDB.cc
index 0b114b4..0ffd5bc 100644
--- a/iocore/hostdb/HostDB.cc
+++ b/iocore/hostdb/HostDB.cc
@@ -391,7 +391,7 @@ HostDBCache::start(int flags)
REC_ReadConfigInt32(storage_size, proxy.config.hostdb.storage_size);
if (storage_path[0] != '/') {
-Layout::relative_to(storage_path, PATH_NAME_MAX, system_root_dir,
storage_path);
+Layout::relative_to(storage_path, PATH_NAME_MAX, Layout::get()-prefix,
storage_path);
}
Debug(hostdb, Storage path is %s, storage_path);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fa100cff/lib/records/I_RecDefs.h
--
diff --git a/lib/records/I_RecDefs.h b/lib/records/I_RecDefs.h
index 9a22613..4517357 100644
--- a/lib/records/I_RecDefs.h
+++ b/lib/records/I_RecDefs.h
@@ -177,7 +177,6 @@ typedef int (*RecRawStatSyncCb) (const char *name, RecDataT
data_type, RecData *
// System Defaults
-extern char system_root_dir[PATH_NAME_MAX + 1];
extern char system_runtime_dir[PATH_NAME_MAX + 1];
extern char system_config_directory[PATH_NAME_MAX + 1];
extern char system_log_dir[PATH_NAME_MAX + 1];
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fa100cff/mgmt/Main.cc
--
diff --git a/mgmt/Main.cc b/mgmt/Main.cc
index 59d697a..a48686b 100644
--- a/mgmt/Main.cc
+++ b/mgmt/Main.cc
@@ -78,7 +78,6 @@ static char action_tags[1024] = ;
static bool proxy_on = true;
// TODO: Check if really need those
-char system_root_dir[PATH_NAME_MAX + 1];
char system_runtime_dir[PATH_NAME_MAX + 1];
char system_config_directory[PATH_NAME_MAX + 1];
char system_log_dir[PATH_NAME_MAX + 1];
@@ -301,13 +300,14 @@ init_dirs()
static void
chdir_root()
{
+ const char * prefix = Layout::get()-prefix;
- if (system_root_dir[0]
[38/50] git commit: TS-2426: add xdebug plugin Makefile.am
TS-2426: add xdebug plugin Makefile.am Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/5cce7365 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/5cce7365 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/5cce7365 Branch: refs/heads/5.0.x Commit: 5cce7365fff855589a5107333871b213d3784ec4 Parents: 399e27c Author: James Peach jpe...@apache.org Authored: Tue Dec 10 10:07:07 2013 -0800 Committer: James Peach jpe...@apache.org Committed: Tue Dec 10 10:07:07 2013 -0800 -- plugins/experimental/xdebug/Makefile.am | 22 ++ 1 file changed, 22 insertions(+) -- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5cce7365/plugins/experimental/xdebug/Makefile.am -- diff --git a/plugins/experimental/xdebug/Makefile.am b/plugins/experimental/xdebug/Makefile.am new file mode 100644 index 000..452c210 --- /dev/null +++ b/plugins/experimental/xdebug/Makefile.am @@ -0,0 +1,22 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# License); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an AS IS BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +include $(top_srcdir)/build/plugins.mk + +pkglib_LTLIBRARIES = xdebug.la +xdebug_la_SOURCES = xdebug.cc +xdebug_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS) +
[23/50] git commit: TS-2082: remove NON_MODULAR define
TS-2082: remove NON_MODULAR define
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/5140b18d
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/5140b18d
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/5140b18d
Branch: refs/heads/5.0.x
Commit: 5140b18d0c15be1b532edab8c92b00b7c862324f
Parents: 51ce9ae
Author: Zhao Yongming ming@gmail.com
Authored: Thu Nov 7 18:53:14 2013 +0800
Committer: Zhao Yongming ming@gmail.com
Committed: Sat Dec 7 14:30:19 2013 +0800
--
iocore/cache/Cache.cc| 11 +-
iocore/cache/CachePages.cc | 2 --
iocore/cache/CachePagesInternal.cc | 4
iocore/cluster/ClusterAPI.cc | 7 ---
iocore/cluster/ClusterHandlerBase.cc | 5 +
iocore/cluster/ClusterProcessor.cc | 2 --
iocore/cluster/P_ClusterCache.h | 2 --
iocore/cluster/P_ClusterInternal.h | 2 --
iocore/hostdb/HostDB.cc | 34 ---
iocore/hostdb/MultiCache.cc | 6 --
iocore/net/I_Socks.h | 3 +--
iocore/net/UnixNetPages.cc | 4
iocore/net/UnixNetProcessor.cc | 4
lib/ts/ink_config.h.in | 1 -
14 files changed, 3 insertions(+), 84 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5140b18d/iocore/cache/Cache.cc
--
diff --git a/iocore/cache/Cache.cc b/iocore/cache/Cache.cc
index 39688a7..711b7c9 100644
--- a/iocore/cache/Cache.cc
+++ b/iocore/cache/Cache.cc
@@ -25,10 +25,8 @@
#include P_Cache.h
// Cache Inspector and State Pages
-#ifdef NON_MODULAR
#include P_CacheTest.h
#include StatPages.h
-#endif
#include I_Layout.h
@@ -580,7 +578,7 @@ static const int DEFAULT_CACHE_OPTIONS = (O_RDWR |
_O_ATTRIB_OVERLAPPED);
int
CacheProcessor::start_internal(int flags)
{
-#ifdef NON_MODULAR
+
ink_assert((int)TS_EVENT_CACHE_OPEN_READ == (int)CACHE_EVENT_OPEN_READ);
ink_assert((int)TS_EVENT_CACHE_OPEN_READ_FAILED ==
(int)CACHE_EVENT_OPEN_READ_FAILED);
ink_assert((int)TS_EVENT_CACHE_OPEN_WRITE == (int)CACHE_EVENT_OPEN_WRITE);
@@ -593,7 +591,6 @@ CacheProcessor::start_internal(int flags)
ink_assert((int)TS_EVENT_CACHE_SCAN_OPERATION_BLOCKED ==
(int)CACHE_EVENT_SCAN_OPERATION_BLOCKED);
ink_assert((int)TS_EVENT_CACHE_SCAN_OPERATION_FAILED ==
(int)CACHE_EVENT_SCAN_OPERATION_FAILED);
ink_assert((int)TS_EVENT_CACHE_SCAN_DONE == (int)CACHE_EVENT_SCAN_DONE);
-#endif
#if AIO_MODE == AIO_MODE_NATIVE
int etype = ET_NET;
@@ -2218,12 +2215,10 @@ AIO_Callback_handler::handle_disk_failure(int /* event
ATS_UNUSED */, void *data
int
Cache::open_done() {
-#ifdef NON_MODULAR
Action *register_ShowCache(Continuation * c, HTTPHdr * h);
Action *register_ShowCacheInternal(Continuation *c, HTTPHdr *h);
statPagesManager.register_http(cache, register_ShowCache);
statPagesManager.register_http(cache-internal, register_ShowCacheInternal);
-#endif
if (total_good_nvol == 0) {
ready = CACHE_INIT_FAILED;
cacheProcessor.cacheInitialized();
@@ -2645,7 +2640,6 @@ Cache::lookup(Continuation *cont, CacheKey *key,
CacheFragType type, char *hostn
return ACTION_RESULT_DONE;
}
-#ifdef NON_MODULAR
Action *
Cache::lookup(Continuation *cont, CacheURL *url, CacheFragType type)
{
@@ -2656,7 +2650,6 @@ Cache::lookup(Continuation *cont, CacheURL *url,
CacheFragType type)
const char *hostname = url-host_get(len);
return lookup(cont, md5, type, (char *) hostname, len);
}
-#endif
int
CacheVC::removeEvent(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
@@ -3417,7 +3410,6 @@ ink_cache_init(ModuleVersion v)
#endif
}
-#ifdef NON_MODULAR
//
Action *
CacheProcessor::open_read(Continuation *cont, URL *url, bool
cluster_cache_local, CacheHTTPHdr *request,
@@ -3483,4 +3475,3 @@ CacheProcessor::remove(Continuation *cont, URL *url, bool
cluster_cache_local, C
return caches[frag_type]-remove(cont, md5, frag_type, true, false,
const_castchar*(hostname), len);
}
-#endif
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5140b18d/iocore/cache/CachePages.cc
--
diff --git a/iocore/cache/CachePages.cc b/iocore/cache/CachePages.cc
index e30dba0..08ef4b7 100644
--- a/iocore/cache/CachePages.cc
+++ b/iocore/cache/CachePages.cc
@@ -23,7 +23,6 @@
#include P_Cache.h
-#ifdef NON_MODULAR
#include api/ts/ts.h
#include Show.h
#include I_Tasks.h
@@ -640,4 +639,3 @@ ShowCache::handleCacheScanCallback(int event, Event *e)
}
}
-#endif // NON_MODULAR
[07/50] git commit: TS-2401: Remove system_config_directory
TS-2401: Remove system_config_directory
Remove all the places the global system_config_directory is used,
replacing it with Layout::get()-sysconfdir where appropriate.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/67306a71
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/67306a71
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/67306a71
Branch: refs/heads/5.0.x
Commit: 67306a71da65f135ff85c2f4d9b966122fa5590a
Parents: f438ab4
Author: James Peach jpe...@apache.org
Authored: Mon Dec 2 14:48:49 2013 -0800
Committer: James Peach jpe...@apache.org
Committed: Thu Dec 5 20:33:49 2013 -0800
--
example/app-template/app-template.cc | 7 ---
lib/records/I_RecCore.h | 11 +++-
lib/records/I_RecDefs.h | 3 -
lib/records/RecCore.cc | 34
mgmt/FileManager.cc | 92 +--
mgmt/FileManager.h | 1 -
mgmt/LocalManager.cc | 18 ++
mgmt/LocalManager.h | 4 +-
mgmt/Main.cc | 18 ++
mgmt/Main.h | 1 -
mgmt/Rollback.cc | 34 +++-
mgmt/Rollback.h | 1 -
mgmt/cluster/VMap.cc | 13 ++---
mgmt/web2/WebIntrMain.cc | 4 +-
proxy/ControlMatcher.cc | 13 ++---
proxy/ControlMatcher.h | 5 +-
proxy/ICPConfig.cc | 13 ++---
proxy/IPAllow.cc | 13 ++---
proxy/IPAllow.h | 1 -
proxy/InkAPI.cc | 3 +-
proxy/Main.cc| 35 +++-
proxy/Plugin.cc | 32 +--
proxy/Plugin.h | 3 +-
proxy/Prefetch.cc| 15 ++---
proxy/Update.cc | 10 ++--
proxy/http/HttpBodyFactory.cc| 27 -
proxy/http/HttpBodyFactory.h | 1 -
proxy/logging/LogConfig.cc | 30 --
proxy/logging/LogStandalone.cc | 4 --
proxy/sac.cc | 8 +--
30 files changed, 151 insertions(+), 303 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/67306a71/example/app-template/app-template.cc
--
diff --git a/example/app-template/app-template.cc
b/example/app-template/app-template.cc
index af23b2b..234bf77 100644
--- a/example/app-template/app-template.cc
+++ b/example/app-template/app-template.cc
@@ -53,8 +53,6 @@ int system_num_of_processors = ink_number_of_processors();
int system_num_of_net_threads = DEFAULT_NUMBER_OF_THREADS;
int system_num_of_udp_threads = DEFAULT_NUMBER_OF_UDP_THREADS;
-char system_config_directory[PATH_NAME_MAX + 1];
-
//int system_remote_management_flag = DEFAULT_REMOTE_MANAGEMENT_FLAG;
//Diags *diags = NULL;
@@ -154,9 +152,6 @@ int main(int argc, char * argv[])
_exit(0);
}
- // Get TS directories
- ink_strlcpy(system_config_directory, Layout::get()-sysconfdir,
sizeof(system_config_directory));
-
if (chdir(Layout::get()-prefix) 0) {
fprintf(stderr,unable to change to root directory \%s\ [%d '%s']\n,
Layout::get()-prefix, errno, strerror(errno));
fprintf(stderr, please set correct path in env variable TS_ROOT \n);
@@ -226,8 +221,6 @@ int main(int argc, char * argv[])
// initialize logging (after event and net processor)
//Log::init(system_remote_management_flag ? 0 : Log::NO_REMOTE_MANAGEMENT);
- //plugin_init(system_config_directory); // plugin.config
-
// Create accept continuation
MyAccept *a = new MyAccept;
a-accept_port = tsapp_port;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/67306a71/lib/records/I_RecCore.h
--
diff --git a/lib/records/I_RecCore.h b/lib/records/I_RecCore.h
index 86f6595..44b0922 100644
--- a/lib/records/I_RecCore.h
+++ b/lib/records/I_RecCore.h
@@ -46,9 +46,18 @@ void RecConfigFileInit(void);
int RecConfigFileParse(const char * path, RecConfigEntryCallback handler, bool
inc_version);
// Return a copy of the system's local state directory, taking
proxy.config.local_state_dir into account. The
-// caller MUST releease the result with ats_free().
+// caller MUST release the result with ats_free().
char * RecConfigReadRuntimeDir();
+// Return a copy of the system's snapshot directory, taking
proxy.config.snapshot_dir into account. The caller
+// MUST release the result with ats_free().
+char * RecConfigReadSnapshotDir();
+
+// Return a copy of a configuration file that is relative to sysconfdir. The
relative path to the configuration
+// file is specified in the configuration
[04/50] git commit: TS-2401: update records.config layout documentation
TS-2401: update records.config layout documentation Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/ccc01b66 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/ccc01b66 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/ccc01b66 Branch: refs/heads/5.0.x Commit: ccc01b66370d4f617b8685b6ba755188344cc215 Parents: a1162d8 Author: James Peach jpe...@apache.org Authored: Thu Dec 5 20:29:52 2013 -0800 Committer: James Peach jpe...@apache.org Committed: Thu Dec 5 20:33:49 2013 -0800 -- .../configuration/records.config.en.rst | 24 ++-- 1 file changed, 17 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ccc01b66/doc/reference/configuration/records.config.en.rst -- diff --git a/doc/reference/configuration/records.config.en.rst b/doc/reference/configuration/records.config.en.rst index 000ed19..bbe1a4d 100644 --- a/doc/reference/configuration/records.config.en.rst +++ b/doc/reference/configuration/records.config.en.rst @@ -166,9 +166,13 @@ System Variables The script executed before the :program:`traffic_manager` process spawns the :program:`traffic_server` process. -.. ts:cv:: CONFIG proxy.config.config_dir STRING config +.. ts:cv:: CONFIG proxy.config.config_dir STRING etc/trafficserver The directory that contains Traffic Server configuration files. + This is a read-only configuration option that contains the + ``SYSCONFDIR`` value specified at build time relative to the + installation prefic. THe ``$TS_ROOT`` environment variable can + be used alter the installation prefix at run time. .. ts:cv:: CONFIG proxy.config.alarm_email STRING :reloadable: @@ -200,8 +204,10 @@ A value of ``0`` means no signal will be sent. .. ts:cv:: CONFIG proxy.config.snapshot_dir STRING snapshots - The directory in which Traffic Server stores configuration snapshots on the local system. Unless you specify an absolute path, this - directory is located in the Traffic Server ``config`` directory. + The directory in which Traffic Server stores configuration + snapshots on the local system. Unless you specify an absolute + path, this directory is located in the Traffic Server ``SYSCONFDIR`` + directory. .. ts:cv:: CONFIG proxy.config.exec_thread.autoconfig INT 1 @@ -1293,9 +1299,11 @@ Customizable User Response Pages Enables (``1``) or disables (``0``) logging for customizable response pages. When enabled, Traffic Server records a message in the error log each time a customized response page is used or modified. -.. ts:cv:: CONFIG proxy.config.body_factory.template_sets_dir STRING config/body_factory +.. ts:cv:: CONFIG proxy.config.body_factory.template_sets_dir STRING etc/trafficserver/body_factory - The customizable response page default directory. + The customizable response page default directory. If this is a + relative path, Traffic Server resolves it relative to the + ``PREFIX`` directory. .. ts:cv:: CONFIG proxy.config.body_factory.response_suppression_mode INT 0 @@ -1556,10 +1564,12 @@ Logging Configuration The hostname of the machine running Traffic Server. -.. ts:cv:: CONFIG proxy.config.log.logfile_dir STRING install_dir\ ``/logs`` +.. ts:cv:: CONFIG proxy.config.log.logfile_dir STRING var/log/trafficserver :reloadable: - The full path to the logging directory. This can be an absolute path or a path relative to the directory in which Traffic Server is installed. + The path to the logging directory. This can be an absolute path + or a path relative to the ``PREFIX`` directory in which Traffic + Server is installed. .. note:: The directory you specify must already exist.
[09/50] git commit: TS-2401: Remove global system_log_dir
TS-2401: Remove global system_log_dir
In the 2 places that actually look at this, we implement the
predictable semantics of using proxy.config.log.logfile_dir (relative
to $PREFIX) if it is specified. Otherwise we use the compile-time
log directory. In either case, we never fall back to different
directories. We either use the one specified by the operator or
fail loudly and suddenly.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/88f51768
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/88f51768
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/88f51768
Branch: refs/heads/5.0.x
Commit: 88f51768941ea440a19d8ff9ee5ef8907b72b782
Parents: bdd7af5
Author: James Peach jpe...@apache.org
Authored: Wed Nov 27 15:51:49 2013 -0800
Committer: James Peach jpe...@apache.org
Committed: Thu Dec 5 20:33:49 2013 -0800
--
example/app-template/app-template.cc | 2 --
lib/records/I_RecDefs.h | 1 -
mgmt/Main.cc | 9
proxy/Initialize.cc | 2 +-
proxy/Main.cc| 13 ---
proxy/logging/LogConfig.cc | 24 +---
proxy/logging/LogStandalone.cc | 1 -
proxy/sac.cc | 8 ---
proxy/shared/DiagsConfig.cc | 37 ++-
9 files changed, 32 insertions(+), 65 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/88f51768/example/app-template/app-template.cc
--
diff --git a/example/app-template/app-template.cc
b/example/app-template/app-template.cc
index fefff13..5f8cb6d 100644
--- a/example/app-template/app-template.cc
+++ b/example/app-template/app-template.cc
@@ -55,7 +55,6 @@ int system_num_of_udp_threads = DEFAULT_NUMBER_OF_UDP_THREADS;
char system_runtime_dir[PATH_NAME_MAX + 1];
char system_config_directory[PATH_NAME_MAX + 1];
-char system_log_dir[PATH_NAME_MAX + 1];
//int system_remote_management_flag = DEFAULT_REMOTE_MANAGEMENT_FLAG;
@@ -159,7 +158,6 @@ int main(int argc, char * argv[])
// Get TS directories
ink_strlcpy(system_config_directory, Layout::get()-sysconfdir,
sizeof(system_config_directory));
ink_strlcpy(system_runtime_dir, Layout::get()-runtimedir,
sizeof(system_runtime_dir));
- ink_strlcpy(system_log_dir, Layout::get()-logdir, sizeof(system_log_dir));
if (chdir(Layout::get()-prefix) 0) {
fprintf(stderr,unable to change to root directory \%s\ [%d '%s']\n,
Layout::get()-prefix, errno, strerror(errno));
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/88f51768/lib/records/I_RecDefs.h
--
diff --git a/lib/records/I_RecDefs.h b/lib/records/I_RecDefs.h
index 4517357..302b3c9 100644
--- a/lib/records/I_RecDefs.h
+++ b/lib/records/I_RecDefs.h
@@ -179,6 +179,5 @@ typedef int (*RecRawStatSyncCb) (const char *name, RecDataT
data_type, RecData *
// System Defaults
extern char system_runtime_dir[PATH_NAME_MAX + 1];
extern char system_config_directory[PATH_NAME_MAX + 1];
-extern char system_log_dir[PATH_NAME_MAX + 1];
#endif
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/88f51768/mgmt/Main.cc
--
diff --git a/mgmt/Main.cc b/mgmt/Main.cc
index a48686b..c8e1a33 100644
--- a/mgmt/Main.cc
+++ b/mgmt/Main.cc
@@ -80,7 +80,6 @@ static bool proxy_on = true;
// TODO: Check if really need those
char system_runtime_dir[PATH_NAME_MAX + 1];
char system_config_directory[PATH_NAME_MAX + 1];
-char system_log_dir[PATH_NAME_MAX + 1];
char mgmt_path[PATH_NAME_MAX + 1];
@@ -287,14 +286,6 @@ init_dirs()
mgmt_elog(0, please set 'proxy.config.local_state_dir'\n);
_exit(1);
}
-
- REC_ReadConfigString(buf, proxy.config.log.logfile_dir, PATH_NAME_MAX);
- Layout::get()-relative(system_log_dir, PATH_NAME_MAX, buf);
- if (access(system_log_dir, W_OK) == -1) {
-mgmt_elog(0, unable to access() log dir'%s': %d, %s\n, system_log_dir,
errno, strerror(errno));
-mgmt_elog(0, please set 'proxy.config.log.logfile_dir'\n);
-_exit(1);
- }
}
static void
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/88f51768/proxy/Initialize.cc
--
diff --git a/proxy/Initialize.cc b/proxy/Initialize.cc
index be296b2..54026ba 100644
--- a/proxy/Initialize.cc
+++ b/proxy/Initialize.cc
@@ -276,7 +276,7 @@ init_system_diags(char *bdt, char *bat)
char diags_logpath[PATH_NAME_MAX + 1];
ink_filepath_make(diags_logpath, sizeof(diags_logpath),
-system_log_dir, DIAGS_LOG_FILE);
+Layout::get()-logdir,
[03/50] git commit: TS-2401: Remove unused global management_directory
TS-2401: Remove unused global management_directory
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/bb26f42a
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/bb26f42a
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/bb26f42a
Branch: refs/heads/5.0.x
Commit: bb26f42affd1983370439a0337b35dc66db80879
Parents: 563c1e9
Author: James Peach jpe...@apache.org
Authored: Wed Nov 27 14:40:07 2013 -0800
Committer: James Peach jpe...@apache.org
Committed: Thu Dec 5 20:33:48 2013 -0800
--
doc/reference/commands/traffic_server.en.rst | 2 --
proxy/Main.cc| 12
proxy/Main.h | 1 -
proxy/logging/LogStandalone.cc | 11 ---
proxy/sac.cc | 3 ---
5 files changed, 29 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bb26f42a/doc/reference/commands/traffic_server.en.rst
--
diff --git a/doc/reference/commands/traffic_server.en.rst
b/doc/reference/commands/traffic_server.en.rst
index 8ae9aab..442a369 100644
--- a/doc/reference/commands/traffic_server.en.rst
+++ b/doc/reference/commands/traffic_server.en.rst
@@ -52,8 +52,6 @@ Description
.. option:: -M, --remote_management
-.. option:: -d DIR, --management_dir DIR
-
.. option:: -C CMD, --command CMD
.. option:: -k, --clear_hostdb
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bb26f42a/proxy/Main.cc
--
diff --git a/proxy/Main.cc b/proxy/Main.cc
index b5a3873..3cdd0f4 100644
--- a/proxy/Main.cc
+++ b/proxy/Main.cc
@@ -144,7 +144,6 @@ char cluster_host[MAXDNAME + 1] = DEFAULT_CLUSTER_HOST;
static char command_string[512] = ;
int remote_management_flag = DEFAULT_REMOTE_MANAGEMENT_FLAG;
-char management_directory[PATH_NAME_MAX+1]; // Layout-sysconfdir
char system_root_dir[PATH_NAME_MAX + 1]; // Layout-prefix
char system_runtime_dir[PATH_NAME_MAX + 1]; // Layout-runtimedir
char system_config_directory[PATH_NAME_MAX + 1]; // Layout-sysconfdir
@@ -210,7 +209,6 @@ static const ArgumentDescription argument_descriptions[] = {
{interval, 'i', Statistics Interval, I, show_statistics,
PROXY_STATS_INTERVAL, NULL},
{remote_management, 'M', Remote Management, T,
remote_management_flag, PROXY_REMOTE_MANAGEMENT, NULL},
- {management_dir, 'd', Management Directory, S255,
management_directory, PROXY_MANAGEMENT_DIRECTORY, NULL},
{command, 'C', Maintenance Command to Execute, S511, command_string,
PROXY_COMMAND_STRING, NULL},
{clear_hostdb, 'k', Clear HostDB on Startup, F,
auto_clear_hostdb_flag, PROXY_CLEAR_HOSTDB, NULL},
{clear_cache, 'K', Clear Cache on Startup, F,
cacheProcessor.auto_clear_flag, PROXY_CLEAR_CACHE, NULL},
@@ -347,15 +345,6 @@ initialize_process_manager()
remote_management_flag = true;
}
- if (access(management_directory, R_OK) == -1) {
-ink_strlcpy(management_directory, Layout::get()-sysconfdir,
sizeof(management_directory));
-if (access(management_directory, R_OK) == -1) {
- fprintf(stderr,unable to access() management path '%s': %d, %s\n,
management_directory, errno, strerror(errno));
- fprintf(stderr,please set management path via command line '-d
management directory'\n);
- _exit(1);
-}
- }
-
RecProcessInit(remote_management_flag ? RECM_CLIENT : RECM_STAND_ALONE,
diags);
if (!remote_management_flag) {
@@ -1303,7 +1292,6 @@ main(int /* argc ATS_UNUSED */, char **argv)
// Before accessing file system initialize Layout engine
Layout::create();
ink_strlcpy(system_root_dir, Layout::get()-prefix, sizeof(system_root_dir));
- ink_strlcpy(management_directory, Layout::get()-sysconfdir,
sizeof(management_directory));
chdir_root(); // change directory to the install root of traffic server.
process_args(argument_descriptions, countof(argument_descriptions), argv);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bb26f42a/proxy/Main.h
--
diff --git a/proxy/Main.h b/proxy/Main.h
index d7a9a12..363fffc 100644
--- a/proxy/Main.h
+++ b/proxy/Main.h
@@ -55,7 +55,6 @@ extern char cluster_host[MAXDNAME + 1];
extern int cluster_port_number;
extern int remote_management_flag;
-extern char management_directory[PATH_NAME_MAX + 1];
inkcoreapi extern int qt_accept_file_descriptor;
inkcoreapi extern int cache_clustering_enabled;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bb26f42a/proxy/logging/LogStandalone.cc
--
diff --git a/proxy/logging/LogStandalone.cc
