[trafficserver] branch master updated: Cache:ttl-in-cache should always override never-cache
This is an automated email from the ASF dual-hosted git repository.
oknet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 14143b7 Cache:ttl-in-cache should always override never-cache
14143b7 is described below
commit 14143b7c4c77817eddd313f7c46c8924cff3c270
Author: yangjian
AuthorDate: Thu Mar 28 16:00:43 2019 +0800
Cache:ttl-in-cache should always override never-cache
---
doc/admin-guide/files/cache.config.en.rst | 13 -
proxy/CacheControl.cc | 9 ++---
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/doc/admin-guide/files/cache.config.en.rst
b/doc/admin-guide/files/cache.config.en.rst
index 40d3a05..3971b9a 100644
--- a/doc/admin-guide/files/cache.config.en.rst
+++ b/doc/admin-guide/files/cache.config.en.rst
@@ -157,7 +157,8 @@ specifiers of the rule in question.
===
Value Effect
===
- ``never-cache`` Never cache specified objects.
+ ``never-cache`` Never cache specified objects, it will be
+ overwrited by ``ttl-in-cache``.
``ignore-no-cache`` Ignore all ``Cache-Control: no-cache`` headers.
``ignore-client-no-cache`` Ignore ``Cache-Control: no-cache`` headers from
client requests.
@@ -250,6 +251,16 @@ prefix. The former fails at this goal, because the second
rule will match all
Javascript files and will override any previous ``revalidate`` values that may
have been set by prior rules.
+ttl-in-cache and never-cache
+
+
+When multiple rules are matched in the same request, ``never-cache`` will
always
+be overwrited by ``ttl-in-cache``. For example::
+
+# ttl-in-cache=1d never-cache=false
+dest_domain=example.com action=never-cache
+dest_domain=example.com ttl-in-cache=1d
+
Examples
diff --git a/proxy/CacheControl.cc b/proxy/CacheControl.cc
index 6e78ed0..423584e 100644
--- a/proxy/CacheControl.cc
+++ b/proxy/CacheControl.cc
@@ -372,9 +372,12 @@ CacheControlRecord::UpdateMatch(CacheControlResult
*result, RequestData *rdata)
break;
case CC_NEVER_CACHE:
if (this->CheckForMatch(h_rdata, result->never_line) == true) {
- result->never_cache = true;
- result->never_line = this->line_num;
- match = true;
+ // ttl-in-cache overrides never-cache
+ if (result->ttl_line == -1) {
+result->never_cache = true;
+result->never_line = this->line_num;
+match = true;
+ }
}
break;
case CC_STANDARD_CACHE:
[trafficserver] branch master updated: Doc: Add links to Slicer plugin
This is an automated email from the ASF dual-hosted git repository. mlibbey pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/master by this push: new 93961f8 Doc: Add links to Slicer plugin 93961f8 is described below commit 93961f82c6718ec7190b533be0900b27e6045211 Author: Miles Libbey AuthorDate: Tue Apr 23 10:15:41 2019 +0800 Doc: Add links to Slicer plugin --- doc/admin-guide/plugins/index.en.rst | 6 ++ 1 file changed, 6 insertions(+) diff --git a/doc/admin-guide/plugins/index.en.rst b/doc/admin-guide/plugins/index.en.rst index 1df7cad..91f9c1e 100644 --- a/doc/admin-guide/plugins/index.en.rst +++ b/doc/admin-guide/plugins/index.en.rst @@ -161,6 +161,7 @@ directory of the |TS| source tree. Experimental plugins can be compiled by passi Multiplexer MySQL Remap Signed URLs + Slicer SSL Headers SSL Session Reuse System Statistics @@ -227,6 +228,11 @@ directory of the |TS| source tree. Experimental plugins can be compiled by passi :doc:`Signed URLs ` Adds support for verifying URL signatures for incoming requests to either deny or redirect access. +:doc:`Slicer ` + Slice full file or range based requests into deterministic chunks, allowing large files to be + spread across multiple cache stripes. Allows range requests to be satisfied by stitching these + chunks together. + :doc:`SSL Session Reuse ` Coordinates Session ID and ticket based TLS session resumption between a group of ATS machines.
[trafficserver] branch master updated: Doc: add prefetch to plugin index page
This is an automated email from the ASF dual-hosted git repository. mlibbey pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/master by this push: new 5fda043 Doc: add prefetch to plugin index page 5fda043 is described below commit 5fda043ce0c29c8253e43a6d670a287b84554d9d Author: Miles Libbey AuthorDate: Tue Apr 23 09:57:34 2019 +0800 Doc: add prefetch to plugin index page --- doc/admin-guide/plugins/index.en.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/admin-guide/plugins/index.en.rst b/doc/admin-guide/plugins/index.en.rst index 91f9c1e..da38b3c 100644 --- a/doc/admin-guide/plugins/index.en.rst +++ b/doc/admin-guide/plugins/index.en.rst @@ -221,6 +221,9 @@ directory of the |TS| source tree. Experimental plugins can be compiled by passi :doc:`MySQL Remap ` Allows dynamic remaps from a MySQL database. +:doc:`Prefetch ` + Pre-fetch objects based on the requested URL path pattern. + :doc:`Remap Purge ` This remap plugin allows the administrator to easily setup remotely controlled ``PURGE`` for the content of an entire remap rule.
[trafficserver] branch master updated: De-tabifies REVIEWERS
This is an automated email from the ASF dual-hosted git repository. rrm pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/master by this push: new 67d98bb De-tabifies REVIEWERS 67d98bb is described below commit 67d98bbfcb619f39c516f3116fa7da9ee34bfb6e Author: Randall Meyer AuthorDate: Mon Apr 29 08:40:26 2019 -0700 De-tabifies REVIEWERS --- REVIEWERS | 29 ++--- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/REVIEWERS b/REVIEWERS index db992a5..628abc2 100644 --- a/REVIEWERS +++ b/REVIEWERS @@ -18,12 +18,12 @@ Committers: add modules as needed and any qualifications after your e-mail addre all/general interest jplev...@apache.org bc...@apache.org - bri...@apache.org +bri...@apache.org mt...@apache.org zw...@apache.org j...@apache.org er...@apache.org - manj...@apache.org +manj...@apache.org lib/ts jplev...@apache.org zw...@apache.org @@ -33,19 +33,19 @@ lib/ts lib/records bc...@apache.org geor...@apache.org - zw...@apache.org +zw...@apache.org Event System/Buffering/VIO/VConnection jplev...@apache.org bc...@apache.org - bri...@apache.org +bri...@apache.org geor...@apache.org Network I/O jplev...@apache.org - not including SSL or UDP except where it intersects the other code bc...@apache.org geor...@apache.org - bri...@apache.org +bri...@apache.org j...@apache.org - zw...@apache.org +zw...@apache.org Raw Cache and AIO jplev...@apache.org bc...@apache.org @@ -53,13 +53,12 @@ Raw Cache and AIO HTTP Caching bc...@apache.org j...@apache.org - zw...@apache.org +zw...@apache.org Block-Cache -Clustering jplev...@apache.org geor...@apache.org j...@apache.org - z...@apache.org +z...@apache.org DNS/HostDB jplev...@apache.org zw...@apache.org @@ -68,11 +67,11 @@ DNS/HostDB er...@apache.org FastIO Docs - dia...@apache.org +dia...@apache.org Examples/Plugins zw...@apache.org bc...@apache.org - bri...@apache.org +bri...@apache.org er...@apache.org HDRs bc...@apache.org @@ -81,7 +80,7 @@ HDRs HTTP bc...@apache.org zw...@apache.org - bri...@apache.org +bri...@apache.org j...@apache.org er...@apache.org Remap @@ -91,7 +90,7 @@ Remap er...@apache.org API zw...@apache.org - bri...@apache.org +bri...@apache.org bc...@apache.org geor...@apache.org er...@apache.org @@ -106,8 +105,8 @@ MGMT Stats bc...@apache.org geor...@apache.org - bri...@apache.org - zw...@apache.org +bri...@apache.org +zw...@apache.org Build System zw...@apache.org bc...@apache.org
[trafficserver] branch master updated: Fixes logging after collation removal
This is an automated email from the ASF dual-hosted git repository. scw00 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/master by this push: new 2050aae Fixes logging after collation removal 2050aae is described below commit 2050aae3cf5efe938d796ae5422a6522de99a89d Author: Randall Meyer AuthorDate: Mon Apr 29 13:36:03 2019 -0700 Fixes logging after collation removal A followup to 82d564486e058ead160bfb8ad15e40b0507ff8aa --- proxy/logging/YamlLogConfig.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy/logging/YamlLogConfig.cc b/proxy/logging/YamlLogConfig.cc index 3e8d408..db3580f 100644 --- a/proxy/logging/YamlLogConfig.cc +++ b/proxy/logging/YamlLogConfig.cc @@ -183,8 +183,8 @@ YamlLogConfig::decodeLogObject(const YAML::Node &node) } auto logObject = new LogObject(fmt, Log::config->logfile_dir, filename.c_str(), file_type, header.c_str(), - (Log::RollingEnabledValues)obj_rolling_enabled, obj_rolling_interval_sec, obj_rolling_offset_hr, - obj_rolling_size_mb); + (Log::RollingEnabledValues)obj_rolling_enabled, Log::config->preproc_threads, + obj_rolling_interval_sec, obj_rolling_offset_hr, obj_rolling_size_mb); // Generate LogDeletingInfo entry for later use std::string ext;
[trafficserver] branch master updated: Fixes spelling in src
This is an automated email from the ASF dual-hosted git repository.
rrm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 4a43f53 Fixes spelling in src
4a43f53 is described below
commit 4a43f53e2ec6fedcb6b60d7787f1508eb8872c7d
Author: Randall Meyer
AuthorDate: Tue Aug 7 09:56:10 2018 -0700
Fixes spelling in src
---
include/tscore/ParseRules.h| 2 +-
src/traffic_cache_tool/CacheDefs.cc| 2 +-
src/traffic_cache_tool/CacheDefs.h | 2 +-
src/traffic_cache_tool/CacheScan.cc| 4 ++--
src/traffic_cache_tool/CacheTool.cc| 2 +-
src/traffic_ctl/config.cc | 8
src/traffic_ctl/traffic_ctl.h | 2 +-
src/traffic_layout/engine.cc | 4 ++--
src/traffic_layout/engine.h| 4 ++--
src/traffic_layout/file_system.cc | 4 ++--
src/traffic_layout/file_system.h | 2 +-
src/traffic_logstats/logstats.cc | 4 ++--
src/traffic_manager/AddConfigFilesHere.cc | 2 +-
src/traffic_manager/traffic_manager.cc | 2 +-
src/traffic_server/FetchSM.cc | 2 +-
src/traffic_server/FetchSM.h | 4 ++--
src/traffic_server/HostStatus.cc | 2 +-
src/traffic_server/InkAPI.cc | 4 ++--
src/traffic_server/InkAPITest.cc | 18 +-
src/traffic_server/SocksProxy.cc | 6 +++---
src/traffic_server/traffic_server.cc | 2 +-
src/traffic_top/traffic_top.cc | 2 +-
src/traffic_wccp/wccp_client.cc| 2 +-
src/tscore/ArgParser.cc| 10 +-
src/tscore/BaseLogFile.cc | 12 ++--
src/tscore/BufferWriterFormat.cc | 8
src/tscore/CryptoHash.cc | 2 +-
src/tscore/Diags.cc| 2 +-
src/tscore/HostLookup.cc | 12 ++--
src/tscore/IntrusivePtrTest.cc | 2 +-
src/tscore/IpMap.cc| 10 +-
src/tscore/JeAllocator.cc | 4 ++--
src/tscore/MatcherUtils.cc | 4 ++--
src/tscore/ParseRules.cc | 6 +++---
src/tscore/TextBuffer.cc | 14 +++---
src/tscore/Tokenizer.cc| 2 +-
src/tscore/ink_base64.cc | 2 +-
src/tscore/ink_file.cc | 4 ++--
src/tscore/ink_memory.cc | 6 +++---
src/tscore/ink_queue_utils.cc | 6 +++---
src/tscore/ink_res_init.cc | 8
src/tscore/ink_res_mkquery.cc | 4 ++--
src/tscore/ink_sock.cc | 2 +-
src/tscore/ink_string++.cc | 2 +-
src/tscore/ink_time.cc | 2 +-
src/tscore/load_http_hdr.cc| 2 +-
src/tscore/lockfile.cc | 4 ++--
src/tscore/unit_tests/test_AcidPtr.cc | 2 +-
src/tscore/unit_tests/test_IntrusivePtr.cc | 2 +-
src/tscore/unit_tests/test_arena.cc| 2 +-
src/tscpp/api/AsyncHttpFetch.cc| 2 +-
src/tscpp/api/GzipDeflateTransformation.cc | 4 ++--
src/tscpp/api/Transaction.cc | 2 +-
src/tscpp/api/TransformationPlugin.cc | 6 +++---
src/tscpp/api/utils_internal.cc| 2 +-
src/tscpp/util/TextView.cc | 4 ++--
src/wccp/WccpEndPoint.cc | 2 +-
src/wccp/WccpLocal.h | 28 ++--
src/wccp/WccpMsg.cc| 2 +-
src/wccp/WccpUtil.h| 2 +-
60 files changed, 138 insertions(+), 138 deletions(-)
diff --git a/include/tscore/ParseRules.h b/include/tscore/ParseRules.h
index d8fe31e..847522e 100644
--- a/include/tscore/ParseRules.h
+++ b/include/tscore/ParseRules.h
@@ -33,7 +33,7 @@ typedef unsigned int CTypeResult;
// Set this to 0 to disable SI
// decimal multipliers
-#define USE_SI_MULTILIERS 1
+#define USE_SI_MULTIPLIERS 1
#define is_char_BIT (1 << 0)
#define is_upalpha_BIT (1 << 1)
diff --git a/src/traffic_cache_tool/CacheDefs.cc
b/src/traffic_cache_tool/CacheDefs.cc
index a87e3c5..e84fd23 100644
--- a/src/traffic_cache_tool/CacheDefs.cc
+++ b/src/traffic_cache_tool/CacheDefs.cc
@@ -874,7 +874,7 @@ Errata
Stripe::loadMeta()
{
// Read from disk in chunks of this size. This needs to be a multiple of
both the
- // store block size and the directory entry size so neither goes acrss read
boundaries.
+ // store block size and the directory entry size so neither goes across read
boundaries.
// Beyond that the value should be in the ~10MB range for what I guess is
best performance
// vs. blocking production disk I/O on a live system.
constexpr static int64_t N = (1 << 8) * CacheStoreBlocks::SCALE *
sizeof(CacheDirEntry);
diff --git a/src/traffic_cache_tool/Ca
[trafficserver] branch master updated: fixes spelling in include
This is an automated email from the ASF dual-hosted git repository.
rrm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 774f55f fixes spelling in include
774f55f is described below
commit 774f55f107bee5316b152afc12b70c59dcb333f3
Author: Randall Meyer
AuthorDate: Thu Apr 25 16:27:28 2019 +0800
fixes spelling in include
---
include/ts/TsException.h | 2 +-
include/ts/experimental.h | 4 ++--
include/ts/remap.h| 10 +-
include/ts/ts.h | 18 +-
include/tscore/AcidPtr.h | 4 ++--
include/tscore/Allocator.h| 2 +-
include/tscore/ArgParser.h| 4 ++--
include/tscore/AtomicBit.h| 2 +-
include/tscore/BufferWriter.h | 22 +++---
include/tscore/BufferWriterForward.h | 2 +-
include/tscore/CryptoHash.h | 2 +-
include/tscore/Extendible.h | 6 +++---
include/tscore/HostLookup.h | 2 +-
include/tscore/I_Layout.h | 2 +-
include/tscore/IntrusiveHashMap.h | 2 +-
include/tscore/IpMap.h| 4 ++--
include/tscore/MemArena.h | 2 +-
include/tscore/ParseRules.h | 4 ++--
include/tscore/Ptr.h | 2 +-
include/tscore/Scalar.h | 4 ++--
include/tscore/SimpleTokenizer.h | 2 +-
include/tscore/TextBuffer.h | 2 +-
include/tscore/Tokenizer.h| 12 ++--
include/tscore/ink_base64.h | 2 +-
include/tscore/ink_cap.h | 2 +-
include/tscore/ink_code.h | 2 +-
include/tscore/ink_endian.h | 2 +-
include/tscore/ink_file.h | 2 +-
include/tscore/ink_hrtime.h | 4 ++--
include/tscore/ink_inet.h | 2 +-
include/tscore/ink_lockfile.h | 2 +-
include/tscore/ink_resolver.h | 4 ++--
include/tscore/signals.h | 2 +-
include/tscpp/api/Continuation.h | 4 ++--
include/tscpp/api/GlobalPlugin.h | 6 +++---
include/tscpp/api/GzipDeflateTransformation.h | 6 +++---
include/tscpp/api/GzipInflateTransformation.h | 8
include/tscpp/api/Headers.h | 14 +++---
include/tscpp/api/Logger.h| 8
include/tscpp/api/Plugin.h| 8
include/tscpp/api/RemapPlugin.h | 2 +-
include/tscpp/api/Stat.h | 2 +-
include/tscpp/api/Transaction.h | 6 +++---
include/tscpp/api/TransactionPlugin.h | 8
include/tscpp/api/TransformationPlugin.h | 4 ++--
include/tscpp/api/noncopyable.h | 2 +-
include/tscpp/util/IntrusiveDList.h | 12 ++--
include/tscpp/util/MemSpan.h | 4 ++--
include/tscpp/util/TextView.h | 12 ++--
include/wccp/Wccp.h | 2 +-
50 files changed, 124 insertions(+), 124 deletions(-)
diff --git a/include/ts/TsException.h b/include/ts/TsException.h
index ca833d0..ff80894 100644
--- a/include/ts/TsException.h
+++ b/include/ts/TsException.h
@@ -35,7 +35,7 @@ namespace ts
/** Base class for ATS exception.
Clients should subclass as appropriate. This is intended to carry
pre-allocated text along so that it can be thrown without any
-addditional memory allocation.
+additional memory allocation.
*/
class Exception
{
diff --git a/include/ts/experimental.h b/include/ts/experimental.h
index 8f9a818..fa8e7ea 100644
--- a/include/ts/experimental.h
+++ b/include/ts/experimental.h
@@ -192,7 +192,7 @@ tsapi TSReturnCode TSHttpTxnInfoIntGet(TSHttpTxn txnp,
TSHttpTxnInfoKey key, TSM
/
* TSHttpTxnCacheLookupCountGet
- * Return: TS_SUCESS/TS_ERROR
+ * Return: TS_SUCCESS/TS_ERROR
/
tsapi TSReturnCode TSHttpTxnCacheLookupCountGet(TSHttpTxn txnp, int
*lookup_count);
tsapi TSReturnCode TSHttpTxnServerRespIgnore(TSHttpTxn txnp);
@@ -390,7 +390,7 @@ tsapi void TSFetchWriteData(TSFetchSM fetch_sm, const void
*data, size_t len);
tsapi ssize_t TSFetchReadData(TSFetchSM fetch_sm, void *buf, size_t len);
/*
- * Lanuch FetchSM to do http request, before calling this API,
+ * Launch FetchSM to do http request, before calling this API,
* you should append http request header into fetch sm through
* TSFetchWriteData() API
*
diff --git a/include/ts/remap.h b/include/ts/r
