[trafficserver] branch master updated (5e63971 -> e50520f)
This is an automated email from the ASF dual-hosted git repository. masaori pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git. from 5e63971 Avoid IOBufferReader::read_avail() call from MIOBuffer::high_water() add e50520f Remove using namespace std No new revisions were added by this update. Summary of changes: iocore/cache/CacheTest.cc | 4 +--- src/traffic_top/stats.h | 13 ++--- 2 files changed, 11 insertions(+), 6 deletions(-)
[trafficserver] branch 9.0.x updated: Adding an autest for traffic_dump.
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 617c6f5 Adding an autest for traffic_dump.
617c6f5 is described below
commit 617c6f5a3587f3fb63f2fab1c11e909d9a487cf9
Author: bneradt
AuthorDate: Fri Nov 1 16:22:14 2019 +
Adding an autest for traffic_dump.
(cherry picked from commit 452d60ea7878b202e45b297083641ed3968fc3fb)
---
plugins/experimental/traffic_dump/traffic_dump.cc | 2 +-
tests/Pipfile | 1 +
.../pluginTest/traffic_dump/gold/200.gold | 12 +++
.../pluginTest/traffic_dump/traffic_dump.test.py | 112 +
.../pluginTest/traffic_dump/verify_replay.py | 96 ++
5 files changed, 222 insertions(+), 1 deletion(-)
diff --git a/plugins/experimental/traffic_dump/traffic_dump.cc
b/plugins/experimental/traffic_dump/traffic_dump.cc
index dc73e16..464dd41 100644
--- a/plugins/experimental/traffic_dump/traffic_dump.cc
+++ b/plugins/experimental/traffic_dump/traffic_dump.cc
@@ -602,7 +602,7 @@ TSPluginInit(int argc, const char *argv[])
TSHttpHookAdd(TS_HTTP_SSN_START_HOOK, ssncont);
TSHttpHookAdd(TS_HTTP_SSN_CLOSE_HOOK, ssncont);
TSLifecycleHookAdd(TS_LIFECYCLE_MSG_HOOK, ssncont);
-TSDebug(PLUGIN_NAME, "Initialized with sample pool size %" PRId64 " bytes
and disk limit %" PRId64 "bytes",
+TSDebug(PLUGIN_NAME, "Initialized with sample pool size %" PRId64 " bytes
and disk limit %" PRId64 " bytes",
sample_pool_size.load(), max_disk_usage.load());
}
diff --git a/tests/Pipfile b/tests/Pipfile
index f8a6bcc..aa4a6e8 100644
--- a/tests/Pipfile
+++ b/tests/Pipfile
@@ -31,6 +31,7 @@ requests = "*"
gunicorn = "*"
httpbin = "*"
microserver = ">=1.0.4"
+jsonschema = "*"
[requires]
python_version = "3"
diff --git a/tests/gold_tests/pluginTest/traffic_dump/gold/200.gold
b/tests/gold_tests/pluginTest/traffic_dump/gold/200.gold
new file mode 100644
index 000..71aa5d5
--- /dev/null
+++ b/tests/gold_tests/pluginTest/traffic_dump/gold/200.gold
@@ -0,0 +1,12 @@
+``
+> GET /`` HTTP/1.1
+> Host: www.example.com``
+> User-Agent: curl/``
+> Accept: */*
+``
+< HTTP/1.1 200 OK
+< Content-Length: 0
+< Date: ``
+< Age: ``
+< Server: ATS/``
+``
diff --git a/tests/gold_tests/pluginTest/traffic_dump/traffic_dump.test.py
b/tests/gold_tests/pluginTest/traffic_dump/traffic_dump.test.py
new file mode 100644
index 000..1b4be84
--- /dev/null
+++ b/tests/gold_tests/pluginTest/traffic_dump/traffic_dump.test.py
@@ -0,0 +1,112 @@
+"""
+Verify traffic_dump functionality.
+"""
+# 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.
+
+import os
+Test.Summary = '''
+Verify traffic_dump functionality.
+'''
+
+Test.SkipUnless(
+Condition.PluginExists('traffic_dump.so'),
+)
+
+# Configure the origin server.
+server = Test.MakeOriginServer("server")
+
+request_header = {"headers": "GET / HTTP/1.1\r\nHost:
www.example.com\r\nContent-Length: 0\r\n\r\n",
+ "timestamp": "1469733493.993", "body": ""}
+response_header = {"headers": "HTTP/1.1 200 OK\r\nConnection:
close\r\nContent-Length: 0\r\n\r\n",
+ "timestamp": "1469733493.993", "body": ""}
+server.addResponse("sessionfile.log", request_header, response_header)
+
+# Define ATS and configure
+ts = Test.MakeATSProcess("ts")
+replay_dir = os.path.join(ts.RunDirectory, "ts", "log")
+ts.Disk.records_config.update({
+'proxy.config.diags.debug.enabled': 1,
+'proxy.config.diags.debug.tags': 'traffic_dump',
+})
+ts.Disk.remap_config.AddLine(
+'map / http://127.0.0.1:{0}'.format(server.Variables.Port)
+)
+# Configure traffic_dump.
+ts.Disk.plugin_config.AddLine(
+'traffic_dump.so --logdir {0} --sample 1 --limit
10'.format(replay_dir)
+)
+
+# Set up trafficserver expectations.
+ts.Disk.diags_log.Content = Testers.ContainsExpression(
+"loading plugin.*traffic_dump.so",
+"Verify the traffic_dump plugin got loaded.")
+ts.Streams.stderr = Testers.ContainsExpression(
+"Initialized with log directory:
[trafficserver] 01/02: Remove never implemented HttpTransact::service_transaction_in_proxy_only_mode
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 003e7123c424b3d64a2f01d70a5c4e6b0b43340f
Author: Randall Meyer
AuthorDate: Fri Nov 1 16:24:21 2019 -0700
Remove never implemented
HttpTransact::service_transaction_in_proxy_only_mode
HttpTransact::service_transaction_in_proxy_only_mode was part of the
original import with a TODO to implement. This was never done.
Also remove proxy.process.http.throttled_proxy_only as it was only
incremented in a code path never executed.
(cherry picked from commit 51961cb54d448c94127028171c297ba3a40793db)
---
.../monitoring/statistics/core/bandwidth.en.rst| 1 -
proxy/http/HttpConfig.cc | 3 ---
proxy/http/HttpConfig.h| 1 -
proxy/http/HttpTransact.cc | 27 --
proxy/http/HttpTransact.h | 1 -
5 files changed, 33 deletions(-)
diff --git a/doc/admin-guide/monitoring/statistics/core/bandwidth.en.rst
b/doc/admin-guide/monitoring/statistics/core/bandwidth.en.rst
index 0b5113b..73f9966 100644
--- a/doc/admin-guide/monitoring/statistics/core/bandwidth.en.rst
+++ b/doc/admin-guide/monitoring/statistics/core/bandwidth.en.rst
@@ -22,7 +22,6 @@
Bandwidth and Transfer
**
-.. ts:stat:: global proxy.process.http.throttled_proxy_only integer
.. ts:stat:: global proxy.process.http.user_agent_request_document_total_size
integer
:type: counter
:units: bytes
diff --git a/proxy/http/HttpConfig.cc b/proxy/http/HttpConfig.cc
index 46f0f09..0d247f5 100644
--- a/proxy/http/HttpConfig.cc
+++ b/proxy/http/HttpConfig.cc
@@ -356,9 +356,6 @@ register_stat_callbacks()
RecRegisterRawStat(http_rsb, RECT_PROCESS, "proxy.process.http.tunnels",
RECD_COUNTER, RECP_PERSISTENT, (int)http_tunnels_stat,
RecRawStatSyncCount);
- RecRegisterRawStat(http_rsb, RECT_PROCESS,
"proxy.process.http.throttled_proxy_only", RECD_COUNTER, RECP_PERSISTENT,
- (int)http_throttled_proxy_only_stat, RecRawStatSyncCount);
-
RecRegisterRawStat(http_rsb, RECT_PROCESS,
"proxy.process.http.parent_proxy_transaction_time", RECD_INT, RECP_PERSISTENT,
(int)http_parent_proxy_transaction_time_stat,
RecRawStatSyncSum);
diff --git a/proxy/http/HttpConfig.h b/proxy/http/HttpConfig.h
index 45f922d..c030fa5 100644
--- a/proxy/http/HttpConfig.h
+++ b/proxy/http/HttpConfig.h
@@ -121,7 +121,6 @@ enum {
http_cache_deletes_stat,
http_tunnels_stat,
- http_throttled_proxy_only_stat,
// document size stats
http_user_agent_request_header_total_size_stat,
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index f5898f0..0664a45 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -1817,11 +1817,6 @@ HttpTransact::DecideCacheLookup(State *s)
}
}
- if (service_transaction_in_proxy_only_mode(s)) {
-s->cache_info.action = CACHE_DO_NO_ACTION;
-s->current.mode = TUNNELLING_PROXY;
-HTTP_INCREMENT_DYN_STAT(http_throttled_proxy_only_stat);
- }
// at this point the request is ready to continue down the
// traffic server path.
@@ -6325,28 +6320,6 @@ HttpTransact::is_response_valid(State *s, HTTPHdr
*incoming_response)
}
}
-///
-// Name : service_transaction_in_proxy_only_mode
-// Description: uses some metric to force this transaction to be proxy-only
-//
-// Details:
-//
-// Some metric may be employed to force the traffic server to enter
-// a proxy-only mode temporarily. This function is called to determine
-// if the current transaction should be proxy-only. The function is
-// called from initialize_state_variables_from_request and is used to
-// set s->current.mode to TUNNELLING_PROXY and just for safety to set
-// s->cache_info.action to CACHE_DO_NO_ACTION.
-//
-// Currently the function is just a placeholder and always returns false.
-//
-///
-bool
-HttpTransact::service_transaction_in_proxy_only_mode(State * /* s ATS_UNUSED
*/)
-{
- return false;
-}
-
void
HttpTransact::process_quick_http_filter(State *s, int method)
{
diff --git a/proxy/http/HttpTransact.h b/proxy/http/HttpTransact.h
index f7bfef5..59948c7 100644
--- a/proxy/http/HttpTransact.h
+++ b/proxy/http/HttpTransact.h
@@ -997,7 +997,6 @@ public:
static bool get_ka_info_from_config(State *s, ConnectionAttributes
*server_info);
static void get_ka_info_from_host_db(State *s, ConnectionAttributes
*server_info, ConnectionAttributes *client_info,
HostDBInfo *host_db_info);
- static bool service_transaction_in_proxy_only_mode(State *s);
static void
[trafficserver] branch 9.0.x updated (bf4aeeb -> e36bc7a)
This is an automated email from the ASF dual-hosted git repository. zwoop pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git. from bf4aeeb Deprecated a bunch of configs for filenames new 003e712 Remove never implemented HttpTransact::service_transaction_in_proxy_only_mode new e36bc7a Fixing include synopsis rendering for API docs. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../monitoring/statistics/core/bandwidth.en.rst| 1 - doc/developer-guide/api/functions/TSAPI.en.rst | 6 +++-- .../api/functions/TSAcceptor.en.rst| 4 +++- .../api/functions/TSActionCancel.en.rst| 4 +++- .../api/functions/TSActionDone.en.rst | 4 +++- .../api/functions/TSCacheRead.en.rst | 4 +++- .../api/functions/TSCacheRemove.en.rst | 4 +++- .../api/functions/TSCacheWrite.en.rst | 4 +++- .../api/functions/TSClientProtocolStack.en.rst | 4 +++- doc/developer-guide/api/functions/TSConfig.en.rst | 4 +++- .../api/functions/TSContCall.en.rst| 4 +++- .../api/functions/TSContCreate.en.rst | 4 +++- .../api/functions/TSContDataGet.en.rst | 4 +++- .../api/functions/TSContDataSet.en.rst | 4 +++- .../api/functions/TSContDestroy.en.rst | 4 +++- .../api/functions/TSContMutexGet.en.rst| 4 +++- .../api/functions/TSContSchedule.en.rst| 4 +++- .../api/functions/TSContScheduleOnPool.en.rst | 4 +++- .../api/functions/TSContScheduleOnThread.en.rst| 4 +++- .../api/functions/TSContThreadAffinityClear.en.rst | 4 +++- .../api/functions/TSContThreadAffinityGet.en.rst | 4 +++- .../api/functions/TSContThreadAffinitySet.en.rst | 4 +++- doc/developer-guide/api/functions/TSDebug.en.rst | 4 +++- .../api/functions/TSEventThreadSelf.en.rst | 4 +++- .../api/functions/TSHostLookup.en.rst | 4 +++- .../api/functions/TSHostLookupResultAddrGet.en.rst | 4 +++- .../api/functions/TSHttpArgs.en.rst| 4 +++- .../api/functions/TSHttpConnect.en.rst | 4 +++- .../api/functions/TSHttpConnectWithPluginId.en.rst | 4 +++- .../api/functions/TSHttpHdrClone.en.rst| 4 +++- .../api/functions/TSHttpHdrCopy.en.rst | 4 +++- .../api/functions/TSHttpHdrCreate.en.rst | 4 +++- .../api/functions/TSHttpHdrDestroy.en.rst | 4 +++- .../api/functions/TSHttpHdrHostGet.en.rst | 4 +++- .../api/functions/TSHttpHdrLengthGet.en.rst| 4 +++- .../api/functions/TSHttpHdrMethodGet.en.rst| 4 +++- .../api/functions/TSHttpHdrMethodSet.en.rst| 4 +++- .../api/functions/TSHttpHdrPrint.en.rst| 4 +++- .../api/functions/TSHttpHdrReasonGet.en.rst| 4 +++- .../api/functions/TSHttpHdrReasonLookup.en.rst | 4 +++- .../api/functions/TSHttpHdrReasonSet.en.rst| 4 +++- .../api/functions/TSHttpHdrStatusGet.en.rst| 4 +++- .../api/functions/TSHttpHdrStatusSet.en.rst| 4 +++- .../api/functions/TSHttpHdrTypeGet.en.rst | 4 +++- .../api/functions/TSHttpHdrTypeSet.en.rst | 4 +++- .../api/functions/TSHttpHdrUrlGet.en.rst | 4 +++- .../api/functions/TSHttpHdrUrlSet.en.rst | 4 +++- .../api/functions/TSHttpHdrVersionGet.en.rst | 4 +++- .../api/functions/TSHttpHdrVersionSet.en.rst | 4 +++- .../api/functions/TSHttpHookAdd.en.rst | 4 +++- .../api/functions/TSHttpOverridableConfig.en.rst | 4 +++- .../api/functions/TSHttpParserCreate.en.rst| 4 +++- .../api/functions/TSHttpSsnClientFdGet.en.rst | 4 +++- .../api/functions/TSHttpSsnIdGet.en.rst| 4 +++- .../api/functions/TSHttpSsnReenable.en.rst | 4 +++- .../api/functions/TSHttpTxnAborted.en.rst | 6 +++-- .../functions/TSHttpTxnCacheLookupStatusGet.en.rst | 4 +++- .../functions/TSHttpTxnCacheLookupUrlGet.en.rst| 8 +-- .../api/functions/TSHttpTxnCachedReqGet.en.rst | 4 +++- .../api/functions/TSHttpTxnCachedRespGet.en.rst| 4 +++- .../api/functions/TSHttpTxnClientFdGet.en.rst | 4 +++- .../functions/TSHttpTxnClientPacketDscpSet.en.rst | 4 +++- .../functions/TSHttpTxnClientPacketMarkSet.en.rst | 4 +++- .../functions/TSHttpTxnClientPacketTosSet.en.rst | 4 +++- .../api/functions/TSHttpTxnClientReqGet.en.rst | 4 +++- .../api/functions/TSHttpTxnClientRespGet.en.rst| 4 +++- .../api/functions/TSHttpTxnErrorBodySet.en.rst | 4 +++- .../api/functions/TSHttpTxnIncomingAddrGet.en.rst | 4 +++- .../api/functions/TSHttpTxnInfoIntGet.en.rst | 4 +++- .../api/functions/TSHttpTxnIntercept.en.rst| 4 +++-
[trafficserver] branch 9.0.x updated: Deprecated a bunch of configs for filenames
This is an automated email from the ASF dual-hosted git repository. zwoop pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/9.0.x by this push: new bf4aeeb Deprecated a bunch of configs for filenames bf4aeeb is described below commit bf4aeeb772bf347feadc14e5789caebb4b77aecf Author: Leif Hedstrom AuthorDate: Tue Nov 5 17:38:26 2019 -0700 Deprecated a bunch of configs for filenames --- doc/release-notes/upgrading.en.rst | 19 +++ 1 file changed, 19 insertions(+) diff --git a/doc/release-notes/upgrading.en.rst b/doc/release-notes/upgrading.en.rst index fb2505d..f7a46b8 100644 --- a/doc/release-notes/upgrading.en.rst +++ b/doc/release-notes/upgrading.en.rst @@ -75,6 +75,25 @@ Removed records.config settings The following settings are simply gone, and have no purpose: * `proxy.config.config_dir` (see PROXY_CONFIG_CONFIG_DIR environment variable) +* `proxy.config.cache.storage_filename` (see next section as well) + +Deprecated records.config settings +-- +The following configurations still exist, and functions, but are considered +deprecated and will be removed in a future release. We **strongly** encourage +you to avoid using any of these: + + * :ts:cv:`proxy.config.http.parent_proxy.file` + * :ts:cv:`proxy.config.socks.socks_config_file` + * :ts:cv:`proxy.config.cache.control.filename` + * :ts:cv:`proxy.config.cache.ip_allow.filename` + * :ts:cv:`proxy.config.cache.hosting_filename` + * :ts:cv:`proxy.config.cache.volume_filename` + * :ts:cv:`proxy.config.dns.splitdns.filename` + * :ts:cv:`proxy.config.log.config.filename` + * :ts:cv:`proxy.config.url_remap.filename` + * :ts:cv:`proxy.config.ssl.server.multicert.filename` + * :ts:cv:`proxy.config.ssl.servername.filename` Deprecated or Removed Features --
[trafficserver] branch master updated (b950519 -> bad68b5)
This is an automated email from the ASF dual-hosted git repository. bcall pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git. from b950519 Cleaned up the changelog command for making our release notes add bad68b5 Remove remnants of http/1.1 pipeline logic. No new revisions were added by this update. Summary of changes: proxy/http/HttpSM.cc | 5 + proxy/http/HttpTransact.cc | 4 proxy/http/HttpTransact.h | 1 - 3 files changed, 1 insertion(+), 9 deletions(-)
[trafficserver] branch master updated (4f8cb03 -> b950519)
This is an automated email from the ASF dual-hosted git repository. bcall pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git. from 4f8cb03 Updated to clang-format v9.0.0 add b950519 Cleaned up the changelog command for making our release notes No new revisions were added by this update. Summary of changes: tools/git/changelog.pl | 137 + 1 file changed, 71 insertions(+), 66 deletions(-)
[trafficserver] 01/03: gcc9: fixed issue with always printing a null char*
This is an automated email from the ASF dual-hosted git repository.
bcall pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit f6ae00e175c70900ac90495268c342e48e23911d
Author: Bryan Call
AuthorDate: Thu May 9 15:42:30 2019 -0700
gcc9: fixed issue with always printing a null char*
(cherry picked from commit 8fcc1ca57997dc19573c777a1395dd3f8a524b98)
---
proxy/http/HttpSM.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index caeb2c7..fe05658 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -7788,7 +7788,7 @@ HttpSM::redirect_request(const char *redirect_url, const
int redirect_len)
if (redirectScheme == nullptr) {
clientUrl.scheme_set(scheme_str, scheme_len);
-SMDebug("http_redirect", "[HttpSM::redirect_request] URL without
scheme %.*s", redirectSchemeLen, redirectScheme);
+SMDebug("http_redirect", "[HttpSM::redirect_request] URL without
scheme");
}
if (noPortInHost) {
[trafficserver] 03/03: Updated Changelog
This is an automated email from the ASF dual-hosted git repository. bcall pushed a commit to branch 8.0.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git commit 66c0112cbf907f3ea2158b91a5106df8594d4bc3 Author: Bryan Call AuthorDate: Tue Nov 5 15:55:23 2019 -0800 Updated Changelog --- CHANGELOG-8.0.6 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG-8.0.6 b/CHANGELOG-8.0.6 index 990f2ec..19906f2 100644 --- a/CHANGELOG-8.0.6 +++ b/CHANGELOG-8.0.6 @@ -14,6 +14,8 @@ Changes with Apache Traffic Server 8.0.6 #5433 - gcc9 - Fix Errata.h, NumericType.h. #5434 - gcc9 - Fix I_Store.h #5435 - gcc9 - fix HTTPVersion. + #5462 - gcc9: fixed issue with always printing a null char* + #5497 - gcc9: sprintf and strncat fixes in plugins #5516 - Make code compilable with BoringSSL #5823 - Avoid AWS auth v4 path/query param double encoding #5833 - Fix H2 internal counters
[trafficserver] branch 8.0.x updated (f95273d -> 66c0112)
This is an automated email from the ASF dual-hosted git repository. bcall pushed a change to branch 8.0.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git. from f95273d Updated Changelog new f6ae00e gcc9: fixed issue with always printing a null char* new 9c6706c gcc9: sprintf and strncat fixes in plugins new 66c0112 Updated Changelog The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGELOG-8.0.6| 2 ++ example/thread_pool/psi.c | 4 ++-- plugins/s3_auth/s3_auth.cc | 4 ++-- proxy/http/HttpSM.cc | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-)
[trafficserver] 02/03: gcc9: sprintf and strncat fixes in plugins
This is an automated email from the ASF dual-hosted git repository.
bcall pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 9c6706c73245718d83fdf1a951c945e96c11d9ce
Author: Bryan Call
AuthorDate: Tue May 14 10:25:22 2019 -0700
gcc9: sprintf and strncat fixes in plugins
(cherry picked from commit fcebeae51454d45c608b1a105b8df8cca70cbbe9)
---
example/thread_pool/psi.c | 4 ++--
plugins/s3_auth/s3_auth.cc | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/example/thread_pool/psi.c b/example/thread_pool/psi.c
index fa465b2..e770960 100644
--- a/example/thread_pool/psi.c
+++ b/example/thread_pool/psi.c
@@ -466,7 +466,7 @@ psi_include(TSCont contp, void *edata ATS_UNUSED)
/* For security reason, we do not allow to include files that are
not in the directory /include.
Also include file cannot contain any path. */
- sprintf(inc_file, "%s/%s", psi_directory, _basename(data->psi_filename));
+ snprintf(inc_file, sizeof(inc_file), "%s/%s", psi_directory,
_basename(data->psi_filename));
/* Read the include file and copy content into iobuffer */
if ((filep = TSfopen(inc_file, "r")) != NULL) {
@@ -971,7 +971,7 @@ TSPluginInit(int argc ATS_UNUSED, const char *argv[]
ATS_UNUSED)
}
/* Initialize the psi directory = /include */
- sprintf(psi_directory, "%s/%s", TSPluginDirGet(), PSI_PATH);
+ snprintf(psi_directory, sizeof(psi_directory), "%s/%s", TSPluginDirGet(),
PSI_PATH);
/* create an TSTextLogObject to log any psi include */
retval = TSTextLogObjectCreate("psi", TS_LOG_MODE_ADD_TIMESTAMP, );
diff --git a/plugins/s3_auth/s3_auth.cc b/plugins/s3_auth/s3_auth.cc
index 1d95405..6814859 100644
--- a/plugins/s3_auth/s3_auth.cc
+++ b/plugins/s3_auth/s3_auth.cc
@@ -620,10 +620,10 @@ S3Request::set_header(const char *header, int header_len,
const char *val, int v
static size_t
str_concat(char *dst, size_t dst_len, const char *src, size_t src_len)
{
- size_t to_copy = (src_len < dst_len) ? src_len : dst_len;
+ size_t to_copy = std::min(dst_len, src_len);
if (to_copy > 0) {
-(void)strncat(dst, src, to_copy);
+strncat(dst, src, to_copy);
}
return to_copy;
[trafficserver] 02/05: Add transform TSIOBuffer watermark APIs.
This is an automated email from the ASF dual-hosted git repository.
bcall pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 568f3e7479545434a93b51bc574393eec78c9b15
Author: Jeffrey Bevill
AuthorDate: Wed Aug 15 15:05:13 2018 -0600
Add transform TSIOBuffer watermark APIs.
(cherry picked from commit 5a2c6acd23321092552516dc8f6599e42d986f18)
---
doc/admin-guide/plugins/lua.en.rst | 24 +
plugins/lua/ts_lua_common.h| 1 +
plugins/lua/ts_lua_http.c | 43 ++
plugins/lua/ts_lua_transform.c | 9 +++-
4 files changed, 76 insertions(+), 1 deletion(-)
diff --git a/doc/admin-guide/plugins/lua.en.rst
b/doc/admin-guide/plugins/lua.en.rst
index 2071b3d..7bc17a9 100644
--- a/doc/admin-guide/plugins/lua.en.rst
+++ b/doc/admin-guide/plugins/lua.en.rst
@@ -2236,6 +2236,30 @@ Here is an example:
`TOP <#ts-lua-plugin>`_
+ts.http.resp_transform.get_upstream_watermark_bytes
+---
+**syntax:** *ts.http.resp_transform.get_upstream_watermark_bytes()*
+
+**context:** transform handler
+
+**description**: This function can be used to retrive the current watermark
bytes for the upstream transform buffer.
+
+
+`TOP <#ts-lua-plugin>`_
+
+ts.http.resp_transform.set_upstream_watermark_bytes
+---
+**syntax:** *ts.http.resp_transform.set_upstream_watermark_bytes(NUMBER)*
+
+**context:** transform handler
+
+**description**: This function can be used to set the watermark bytes of the
upstream transform buffer.
+
+Setting the watermark bytes above 32kb may improve the performance of the
transform handler.
+
+
+`TOP <#ts-lua-plugin>`_
+
ts.http.resp_transform.set_downstream_bytes
---
**syntax:** *ts.http.resp_transform.set_downstream_bytes(NUMBER)*
diff --git a/plugins/lua/ts_lua_common.h b/plugins/lua/ts_lua_common.h
index b98e42f..dba8b7d 100644
--- a/plugins/lua/ts_lua_common.h
+++ b/plugins/lua/ts_lua_common.h
@@ -144,6 +144,7 @@ typedef struct {
ts_lua_http_ctx *hctx;
int64_t upstream_bytes;
+ int64_t upstream_watermark_bytes;
int64_t downstream_bytes;
int64_t total;
diff --git a/plugins/lua/ts_lua_http.c b/plugins/lua/ts_lua_http.c
index e840861..b10fefb 100644
--- a/plugins/lua/ts_lua_http.c
+++ b/plugins/lua/ts_lua_http.c
@@ -105,6 +105,8 @@ static void ts_lua_inject_server_state_variables(lua_State
*L);
static void ts_lua_inject_http_resp_transform_api(lua_State *L);
static int ts_lua_http_resp_transform_get_upstream_bytes(lua_State *L);
+static int ts_lua_http_resp_transform_get_upstream_watermark_bytes(lua_State
*L);
+static int ts_lua_http_resp_transform_set_upstream_watermark_bytes(lua_State
*L);
static int ts_lua_http_resp_transform_set_downstream_bytes(lua_State *L);
void
@@ -194,6 +196,12 @@ ts_lua_inject_http_resp_transform_api(lua_State *L)
lua_pushcfunction(L, ts_lua_http_resp_transform_get_upstream_bytes);
lua_setfield(L, -2, "get_upstream_bytes");
+ lua_pushcfunction(L,
ts_lua_http_resp_transform_get_upstream_watermark_bytes);
+ lua_setfield(L, -2, "get_upstream_watermark_bytes");
+
+ lua_pushcfunction(L,
ts_lua_http_resp_transform_set_upstream_watermark_bytes);
+ lua_setfield(L, -2, "set_upstream_watermark_bytes");
+
lua_pushcfunction(L, ts_lua_http_resp_transform_set_downstream_bytes);
lua_setfield(L, -2, "set_downstream_bytes");
}
@@ -885,6 +893,41 @@ ts_lua_http_resp_transform_get_upstream_bytes(lua_State *L)
}
static int
+ts_lua_http_resp_transform_get_upstream_watermark_bytes(lua_State *L)
+{
+ ts_lua_http_transform_ctx *transform_ctx;
+
+ transform_ctx = ts_lua_get_http_transform_ctx(L);
+ if (transform_ctx == NULL) {
+TSError("[ts_lua] missing transform_ctx");
+return 0;
+ }
+
+ lua_pushnumber(L, transform_ctx->upstream_watermark_bytes);
+
+ return 1;
+}
+
+static int
+ts_lua_http_resp_transform_set_upstream_watermark_bytes(lua_State *L)
+{
+ int64_t n;
+ ts_lua_http_transform_ctx *transform_ctx;
+
+ transform_ctx = ts_lua_get_http_transform_ctx(L);
+ if (transform_ctx == NULL) {
+TSError("[ts_lua] missing transform_ctx");
+return 0;
+ }
+
+ n = luaL_checkinteger(L, 1);
+
+ transform_ctx->upstream_watermark_bytes = n;
+
+ return 0;
+}
+
+static int
ts_lua_http_resp_transform_set_downstream_bytes(lua_State *L)
{
int64_t n;
diff --git a/plugins/lua/ts_lua_transform.c b/plugins/lua/ts_lua_transform.c
index e66a3b0..56c27fc 100644
--- a/plugins/lua/ts_lua_transform.c
+++ b/plugins/lua/ts_lua_transform.c
@@ -66,7 +66,7 @@ ts_lua_transform_handler(TSCont contp,
ts_lua_http_transform_ctx *transform_ctx,
TSVIO input_vio;
TSIOBufferReader input_reader;
TSIOBufferBlock blk;
- int64_t toread, towrite, blk_len, upstream_done, input_avail, l;
+ int64_t toread, towrite, blk_len, upstream_done, input_avail,
input_wm_bytes, l;
[trafficserver] branch 8.0.x updated (4fbce44 -> f95273d)
This is an automated email from the ASF dual-hosted git repository. bcall pushed a change to branch 8.0.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git. from 4fbce44 Trying autest again, this passed in our testing container new 2f6751f Fixes help message for traffic_top's sleep switch new 568f3e7 Add transform TSIOBuffer watermark APIs. new 51c42dd Changed how current age is determined to age out documents. Guaranteed freshness was being used innapropriately when the docs age was already beyond that value new c786eba Fixed url_sig error when storing base64ed params in penultimate segment. new f95273d Updated Changelog The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGELOG-8.0.6| 5 ++ doc/admin-guide/plugins/lua.en.rst | 24 +++ plugins/experimental/url_sig/url_sig.c | 111 - plugins/lua/ts_lua_common.h| 1 + plugins/lua/ts_lua_http.c | 43 + plugins/lua/ts_lua_transform.c | 9 ++- proxy/http/HttpTransact.cc | 9 ++- src/traffic_top/traffic_top.cc | 2 +- 8 files changed, 172 insertions(+), 32 deletions(-)
[trafficserver] 03/05: Changed how current age is determined to age out documents. Guaranteed freshness was being used innapropriately when the docs age was already beyond that value
This is an automated email from the ASF dual-hosted git repository.
bcall pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 51c42dde1b50d4e8c0e9ca4491710fa24a995835
Author: ezelko260
AuthorDate: Sat Apr 6 00:31:36 2019 +
Changed how current age is determined to age out documents. Guaranteed
freshness was being used innapropriately when the docs age was already beyond
that value
(cherry picked from commit 2c3dd8dd62116c0df3326b69d045a30daa47aad0)
---
proxy/http/HttpTransact.cc | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index de03df6..e78fdd9 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -7172,11 +7172,16 @@ HttpTransact::what_is_document_freshness(State *s,
HTTPHdr *client_request, HTTP
current_age =
HttpTransactHeaders::calculate_document_age(s->request_sent_time,
s->response_received_time, cached_obj_response,
response_date,
s->current.now);
- // Overflow ?
+ // First check overflow status
+ // Second if current_age is under the max, use the smaller value
+ // Finally we take the max of current age or guaranteed max, this ensures it
will
+ // age out properly, otherwise a doc will never expire if guaranteed <
document max-age
if (current_age < 0) {
current_age = s->txn_conf->cache_guaranteed_max_lifetime;
- } else {
+ } else if (current_age < s->txn_conf->cache_guaranteed_max_lifetime) {
current_age = std::min((time_t)s->txn_conf->cache_guaranteed_max_lifetime,
current_age);
+ } else {
+current_age = std::max((time_t)s->txn_conf->cache_guaranteed_max_lifetime,
current_age);
}
TxnDebug("http_match", "[what_is_document_freshness] fresh_limit: %d
current_age: %" PRId64, fresh_limit, (int64_t)current_age);
[trafficserver] 04/05: Fixed url_sig error when storing base64ed params in penultimate segment.
This is an automated email from the ASF dual-hosted git repository.
bcall pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit c786ebabd77cffd21c3a0e61f8d1afbfa64f1673
Author: Chris Lemmons
AuthorDate: Tue Jul 31 17:51:53 2018 +
Fixed url_sig error when storing base64ed params in penultimate segment.
(cherry picked from commit 2f1dec1e3759c87bf4bdcbcfbae762993d60bbcf)
---
plugins/experimental/url_sig/url_sig.c | 111 -
1 file changed, 83 insertions(+), 28 deletions(-)
diff --git a/plugins/experimental/url_sig/url_sig.c
b/plugins/experimental/url_sig/url_sig.c
index 65c36ac..6aa1fe0 100644
--- a/plugins/experimental/url_sig/url_sig.c
+++ b/plugins/experimental/url_sig/url_sig.c
@@ -330,14 +330,38 @@ getAppQueryString(const char *query_string, int
query_length)
}
}
+/** fixedBufferWrite safely writes no more than *dest_len bytes to *dest_end
+ * from src. If copying src_len bytes to *dest_len would overflow, it returns
+ * zero. *dest_end is advanced and *dest_len is decremented to account for the
+ * written data. No null-terminators are written automatically (though they
+ * could be copied with data).
+ */
+static int
+fixedBufferWrite(char **dest_end, int *dest_len, const char *src, int src_len)
+{
+ if (src_len > *dest_len) {
+return 0;
+ }
+ memcpy(*dest_end, src, src_len);
+ *dest_end += src_len;
+ *dest_len -= src_len;
+ return 1;
+}
+
static char *
urlParse(char *url, char *anchor, char *new_path_seg, int new_path_seg_len,
char *signed_seg, unsigned int signed_seg_len)
{
char *segment[MAX_SEGMENTS];
unsigned char decoded_string[2048] = {'\0'};
- char new_url[8192] = {'\0'};
+ char new_url[8192]; /* new_url is not null_terminated */
char *p = NULL, *sig_anchor = NULL, *saveptr = NULL;
- int i = 0, numtoks = 0, cp_len = 0, l, decoded_len = 0, sig_anchor_seg = 0;
+ int i = 0, numtoks = 0, decoded_len = 0, sig_anchor_seg = 0;
+
+ char *new_url_end= new_url;
+ int new_url_len_left = sizeof(new_url);
+
+ char *new_path_seg_end= new_path_seg;
+ int new_path_seg_len_left = new_path_seg_len;
char *skip = strchr(url, ':');
if (!skip || skip[1] != '/' || skip[2] != '/') {
@@ -345,8 +369,11 @@ urlParse(char *url, char *anchor, char *new_path_seg, int
new_path_seg_len, char
}
skip += 3;
// preserve the scheme in the new_url.
- strncat(new_url, url, skip - url);
- TSDebug(PLUGIN_NAME, "%s:%d - new_url: %s\n", __FILE__, __LINE__, new_url);
+ if (!fixedBufferWrite(_url_end, _url_len_left, url, skip - url)) {
+TSError("insufficient space to copy schema into new_path_seg buffer.");
+return NULL;
+ }
+ TSDebug(PLUGIN_NAME, "%s:%d - new_url: %*s\n", __FILE__, __LINE__,
(int)(new_url_end - new_url), new_url);
// parse the url.
if ((p = strtok_r(skip, "/", )) != NULL) {
@@ -387,19 +414,18 @@ urlParse(char *url, char *anchor, char *new_path_seg, int
new_path_seg_len, char
// last path segment so skip them.
continue;
}
-l = strlen(segment[i]);
-if (l + 1 > new_path_seg_len) {
- TSError("insuficient space to copy into new_path_seg buffer.");
+if (!fixedBufferWrite(_path_seg_end, _path_seg_len_left,
segment[i], strlen(segment[i]))) {
+ TSError("insufficient space to copy into new_path_seg buffer.");
return NULL;
-} else {
- memcpy(new_path_seg, segment[i], l);
- new_path_seg[l] = '\0';
- if (i != numtoks - 1) {
-strncat(new_path_seg, "/", 1);
+}
+if (i != numtoks - 1) {
+ if (!fixedBufferWrite(_path_seg_end, _path_seg_len_left, "/",
1)) {
+TSError("insufficient space to copy into new_path_seg buffer.");
+return NULL;
}
- cp_len += l + 1;
}
}
+ *new_path_seg_end = '\0';
TSDebug(PLUGIN_NAME, "new_path_seg: %s", new_path_seg);
// save the encoded signing parameter data
@@ -434,24 +460,53 @@ urlParse(char *url, char *anchor, char *new_path_seg, int
new_path_seg_len, char
}
TSDebug(PLUGIN_NAME, "decoded_string: %s", decoded_string);
- for (i = 0; i < numtoks; i++) {
-// cp the base64 decoded string.
-if (i == sig_anchor_seg && sig_anchor != NULL) {
- memcpy(new_url, segment[i], strlen(segment[i]));
- memcpy(new_url, (char *)decoded_string, strlen((char *)decoded_string));
- strncat(new_url, "/", 1);
- continue;
-} else if (i == numtoks - 2 && sig_anchor == NULL) {
- memcpy(new_url, (char *)decoded_string, strlen((char *)decoded_string));
- strncat(new_url, "/", 1);
- continue;
+ {
+int oob = 0; /* Out Of Buffer */
+
+for (i = 0; i < numtoks; i++) {
+ // cp the base64 decoded string.
+ if (i == sig_anchor_seg && sig_anchor != NULL) {
+if (!fixedBufferWrite(_url_end, _url_len_left, segment[i],
strlen(segment[i]))) {
+ oob = 1;
+ break;
+}
+if (!fixedBufferWrite(_url_end,
[trafficserver] 01/05: Fixes help message for traffic_top's sleep switch
This is an automated email from the ASF dual-hosted git repository.
bcall pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 2f6751ff7e8a60364038a1552555f5cb0f98215c
Author: Randall Meyer
AuthorDate: Thu Oct 24 10:30:42 2019 -0500
Fixes help message for traffic_top's sleep switch
Closes issue #6051
(cherry picked from commit 0a455638854e3f771c2e92521bf8f17aa38fc836)
---
src/traffic_top/traffic_top.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/traffic_top/traffic_top.cc b/src/traffic_top/traffic_top.cc
index e093636..90c1acd 100644
--- a/src/traffic_top/traffic_top.cc
+++ b/src/traffic_top/traffic_top.cc
@@ -400,7 +400,7 @@ main(int argc, const char **argv)
version.setup(PACKAGE_NAME, "traffic_top", PACKAGE_VERSION, __DATE__,
__TIME__, BUILD_MACHINE, BUILD_PERSON, "");
const ArgumentDescription argument_descriptions[] = {
-{"sleep", 's', "Enable debugging output", "I", _time, nullptr,
nullptr},
+{"sleep", 's', "Sets the delay between updates (in seconds)", "I",
_time, nullptr, nullptr},
HELP_ARGUMENT_DESCRIPTION(),
VERSION_ARGUMENT_DESCRIPTION(),
RUNROOT_ARGUMENT_DESCRIPTION(),
[trafficserver] 05/05: Updated Changelog
This is an automated email from the ASF dual-hosted git repository. bcall pushed a commit to branch 8.0.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git commit f95273d3156bbcc6f7cb3cf6a0d987e5828d7d64 Author: Bryan Call AuthorDate: Tue Nov 5 15:39:16 2019 -0800 Updated Changelog --- CHANGELOG-8.0.6 | 5 + 1 file changed, 5 insertions(+) diff --git a/CHANGELOG-8.0.6 b/CHANGELOG-8.0.6 index 55c28fb..990f2ec 100644 --- a/CHANGELOG-8.0.6 +++ b/CHANGELOG-8.0.6 @@ -1,8 +1,11 @@ Changes with Apache Traffic Server 8.0.6 + #4042 - Fixed url_sig error when storing base64ed params in penultimate segment. + #4117 - Add transform TSIOBuffer watermark APIs. #4590 - Print thread name instead of thread id #4840 - resolve stack-use-after-scope in YamlLogConfig.cc #5078 - Fix directives for checking TS_USE_TLS_OCSP #5105 - tscore/ink_hrtime: add missing cstdint import + #5241 - Changed how current age is determined to age out documents #5316 - cppcheck: Removed problematic move operators for FixedBufferWriter. #5331 - Off by 1 error in memcpy of redirect url #5424 - Fix ContFlags for gcc 9. @@ -21,4 +24,6 @@ Changes with Apache Traffic Server 8.0.6 #5935 - Perform a SSL quiet shutdown when close-notify is not sent #5989 - Concurrent SRV requests failure #6047 - Change the ready checks for ats to use the actual ats port and not th… + #6068 - Fixes help message for traffic_top's sleep switch #6088 - Local 8.0.x change for gcc9 - Map.h, MemSpan.h, ink_uuid.h + #6113 - Patch to fix autest issues
[trafficserver] branch 9.0.x updated: Updated to clang-format v9.0.0
This is an automated email from the ASF dual-hosted git repository. zwoop pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/9.0.x by this push: new 460d1f2 Updated to clang-format v9.0.0 460d1f2 is described below commit 460d1f25a771024e056b85e2d96cab0a7d5893e7 Author: Leif Hedstrom AuthorDate: Tue Nov 5 14:21:15 2019 -0700 Updated to clang-format v9.0.0 --- .clang-format | 40 --- example/plugins/c-api/cache_scan/cache_scan.cc | 2 +- example/plugins/c-api/intercept/intercept.cc | 2 +- example/plugins/c-api/passthru/passthru.cc | 2 +- example/plugins/c-api/statistic/statistic.cc | 2 +- .../AsyncHttpFetchStreaming.cc | 2 +- example/plugins/cpp-api/intercept/intercept.cc | 2 +- include/tscore/BufferWriter.h | 4 +- include/tscore/Errata.h| 4 +- include/tscore/IpMap.h | 8 ++-- include/tscore/RbTree.h| 4 +- include/tscore/ink_inet.h | 2 +- include/wccp/Wccp.h| 2 +- iocore/cache/CacheDir.cc | 3 +- iocore/cache/CacheTest.cc | 45 -- iocore/net/quic/Mock.h | 5 +-- lib/records/RecCore.cc | 15 mgmt/WebMgmtUtils.cc | 5 +-- mgmt/api/INKMgmtAPI.cc | 2 +- plugins/experimental/metalink/metalink.cc | 2 +- plugins/experimental/slice/HttpHeader.h| 2 +- plugins/experimental/slice/Range.cc| 2 +- plugins/experimental/slice/transfer.cc | 3 +- plugins/generator/generator.cc | 5 +-- proxy/ControlBase.h| 4 +- proxy/http/Http1Transaction.cc | 3 +- proxy/logging/LogConfig.cc | 3 +- src/traffic_server/traffic_server.cc | 3 +- src/tscore/BufferWriterFormat.cc | 45 -- src/tscore/EventNotify.cc | 3 +- src/tscore/IpMap.cc| 2 +- src/tscore/ink_res_mkquery.cc | 17 src/tscore/test_atomic.cc | 2 +- src/tscore/test_freelist.cc| 2 +- src/wccp/WccpLocal.h | 34 tools/clang-format.sh | 6 +-- 36 files changed, 152 insertions(+), 137 deletions(-) diff --git a/.clang-format b/.clang-format index a708974..292f1cc 100644 --- a/.clang-format +++ b/.clang-format @@ -2,42 +2,48 @@ Language:Cpp AccessModifierOffset: -2 AlignAfterOpenBracket: Align +AlignConsecutiveMacros: false AlignConsecutiveAssignments: true AlignConsecutiveDeclarations: false AlignEscapedNewlines: Left AlignOperands: true AlignTrailingComments: true +AllowAllArgumentsOnNextLine: true +AllowAllConstructorInitializersOnNextLine: true AllowAllParametersOfDeclarationOnNextLine: false AllowShortBlocksOnASingleLine: false AllowShortCaseLabelsOnASingleLine: false AllowShortFunctionsOnASingleLine: Inline -AllowShortIfStatementsOnASingleLine: false +AllowShortLambdasOnASingleLine: All +AllowShortIfStatementsOnASingleLine: Never AllowShortLoopsOnASingleLine: false AlwaysBreakAfterDefinitionReturnType: All AlwaysBreakAfterReturnType: AllDefinitions AlwaysBreakBeforeMultilineStrings: false -AlwaysBreakTemplateDeclarations: false +AlwaysBreakTemplateDeclarations: MultiLine BinPackArguments: true BinPackParameters: true BraceWrapping: + AfterCaseLabel: false AfterClass: true - AfterControlStatement: true - AfterEnum: true + AfterControlStatement: false + AfterEnum: false AfterFunction: true AfterNamespace: true AfterObjCDeclaration: false - AfterStruct: true - AfterUnion: true - AfterExternBlock: true + AfterStruct: false + AfterUnion: false + AfterExternBlock: false BeforeCatch: false BeforeElse: false IndentBraces:false - SplitEmptyFunction: false - SplitEmptyRecord: false - SplitEmptyNamespace: false + SplitEmptyFunction: true + SplitEmptyRecord: true + SplitEmptyNamespace: true BreakBeforeBinaryOperators: None BreakBeforeBraces: Linux BreakBeforeInheritanceComma: false +BreakInheritanceList: BeforeColon BreakBeforeTernaryOperators: false BreakConstructorInitializersBeforeComma: false BreakConstructorInitializers: BeforeColon @@ -81,6 +87,7 @@ MacroBlockBegin: '' MacroBlockEnd: '' MaxEmptyLinesToKeep: 1 NamespaceIndentation: Inner +ObjCBinPackProtocolList: Auto ObjCBlockIndentWidth: 2 ObjCSpaceAfterProperty: true
[trafficserver] branch master updated (51961cb -> 4f8cb03)
This is an automated email from the ASF dual-hosted git repository. zwoop pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git. from 51961cb Remove never implemented HttpTransact::service_transaction_in_proxy_only_mode add 4f8cb03 Updated to clang-format v9.0.0 No new revisions were added by this update. Summary of changes: .clang-format | 40 --- example/plugins/c-api/cache_scan/cache_scan.cc | 2 +- example/plugins/c-api/intercept/intercept.cc | 2 +- example/plugins/c-api/passthru/passthru.cc | 2 +- example/plugins/c-api/statistic/statistic.cc | 2 +- .../AsyncHttpFetchStreaming.cc | 2 +- example/plugins/cpp-api/intercept/intercept.cc | 2 +- include/tscore/BufferWriter.h | 4 +- include/tscore/Errata.h| 4 +- include/tscore/IpMap.h | 8 ++-- include/tscore/RbTree.h| 4 +- include/tscore/ink_inet.h | 2 +- include/wccp/Wccp.h| 2 +- iocore/cache/CacheDir.cc | 3 +- iocore/cache/CacheTest.cc | 45 -- iocore/net/quic/Mock.h | 5 +-- lib/records/RecCore.cc | 15 mgmt/WebMgmtUtils.cc | 5 +-- mgmt/api/INKMgmtAPI.cc | 2 +- plugins/experimental/metalink/metalink.cc | 2 +- plugins/experimental/slice/HttpHeader.h| 2 +- plugins/experimental/slice/Range.cc| 2 +- plugins/experimental/slice/transfer.cc | 3 +- plugins/generator/generator.cc | 5 +-- proxy/ControlBase.h| 4 +- proxy/http/Http1Transaction.cc | 3 +- proxy/http/HttpConfig.cc | 32 +++ proxy/logging/LogConfig.cc | 3 +- src/traffic_server/traffic_server.cc | 3 +- src/tscore/BufferWriterFormat.cc | 45 -- src/tscore/EventNotify.cc | 3 +- src/tscore/IpMap.cc| 2 +- src/tscore/ink_res_mkquery.cc | 17 src/tscore/test_atomic.cc | 2 +- src/tscore/test_freelist.cc| 2 +- src/wccp/WccpLocal.h | 34 tools/clang-format.sh | 6 +-- 37 files changed, 169 insertions(+), 152 deletions(-)
[trafficserver] branch master updated (d22de24 -> 51961cb)
This is an automated email from the ASF dual-hosted git repository. rrm pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git. from d22de24 Add Metrics to track SSL Handshake attempts add 51961cb Remove never implemented HttpTransact::service_transaction_in_proxy_only_mode No new revisions were added by this update. Summary of changes: .../monitoring/statistics/core/bandwidth.en.rst| 1 - proxy/http/HttpConfig.cc | 3 --- proxy/http/HttpConfig.h| 1 - proxy/http/HttpTransact.cc | 27 -- proxy/http/HttpTransact.h | 1 - 5 files changed, 33 deletions(-)
[trafficserver] branch master updated (bbcffa0 -> d22de24)
This is an automated email from the ASF dual-hosted git repository. sudheerv pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git. from bbcffa0 Removes the records.config.shadow alternative config file add d22de24 Add Metrics to track SSL Handshake attempts No new revisions were added by this update. Summary of changes: iocore/net/SSLNetVConnection.cc | 2 ++ iocore/net/SSLStats.cc | 4 iocore/net/SSLStats.h | 2 ++ 3 files changed, 8 insertions(+)
