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 766f8dfc0dbfdb925badd1c9141ff7e62f7ac74b
Author: Masaori Koshiba <masa...@apache.org>
AuthorDate: Tue Jan 7 09:08:24 2020 +0900
Cleanup trailing whitespaces
---
CHANGELOG-8.0.0 | 10 +++----
CHANGELOG-8.0.2 | 2 +-
doc/admin-guide/plugins/cachekey.en.rst | 2 +-
doc/admin-guide/plugins/lua.en.rst | 3 +-
doc/appendices/command-line/traffic_layout.en.rst | 6 ++--
.../internal-libraries/ArgParser.en.rst | 4 +--
doc/ext/traffic-server.py | 2 +-
rc/trafficserver.in | 4 +--
tests/README.md | 4 +--
tests/gold_tests/autest-site/microserver.test.ext | 2 +-
.../gold_tests/autest-site/traffic_replay.test.ext | 4 +--
tests/tools/README.md | 18 ++++++------
tools/traffic_via.pl | 32 +++++++++++-----------
13 files changed, 46 insertions(+), 47 deletions(-)
diff --git a/CHANGELOG-8.0.0 b/CHANGELOG-8.0.0
index 5631aa0..f3d6656 100644
--- a/CHANGELOG-8.0.0
+++ b/CHANGELOG-8.0.0
@@ -369,7 +369,7 @@ Changes with Apache Traffic Server 8.0.0
#2190 - The content-type of TRACE response should be message/http.
#2194 - Better initialization in Thread.cc.
#2195 - Fix race condition in thread startup.
- #2196 - Adding DNS over TCP support
+ #2196 - Adding DNS over TCP support
#2201 - Add experimental plugin to initiate H2 Server push for preload links.
#2202 - H2 test with traffic -replay
#2209 - Rework SSL Handshake Hooks and add tls_hooks tests.
@@ -451,7 +451,7 @@ Changes with Apache Traffic Server 8.0.0
#2432 - Format python code with autopep8
#2434 - Coverity 1379933: Control flow issues (DEADCODE)
#2435 - Resign server.pem for autests to 10 years
- #2437 - null transform test
+ #2437 - null transform test
#2439 - Coverity CID 1380022: FORWARD_NULL
#2440 - Optimize: Add startIO & stopIO for NetHandler
#2441 - Bug fix for event thread names
@@ -537,7 +537,7 @@ Changes with Apache Traffic Server 8.0.0
#2638 - Turn off exception warning for gcc 7
#2639 - Fixed issue with clean/distclean
#2643 - fix the missing lock in TSVConnFdCreate api
- #2644 - remove dup setting with NO_FD
+ #2644 - remove dup setting with NO_FD
#2647 - Added arguments for port number and ip in microdns, microserver
extension.
#2648 - This removes the FILE_WRITE mechanism from the core
#2649 - Move http 408 response logic into transaction
@@ -558,7 +558,7 @@ Changes with Apache Traffic Server 8.0.0
#2690 - Fixed chunked_encoding gold file
#2691 - Kill unused .c file which contains code in a language invented by a
Danish guy.
#2694 - Implement zero-copy within UDPNetProcessorInternal::udp_read_from_net
- #2696 - Script load speedup for ts_lua remap plugin
+ #2696 - Script load speedup for ts_lua remap plugin
#2697 - List packages for building in Ubuntu
#2698 - CID 1226158: Uninitialized members
#2714 - Restructured traffic_layout and modified runroot command line
@@ -906,7 +906,7 @@ Changes with Apache Traffic Server 8.0.0
#3526 - Ran clang-tidy with readability-braces-around-statements
#3527 - Cleans up some pylint issues in the python code
#3529 - Correct parameter for certificate verification
- #3530 - Add time option to traffic_ctl host down.
+ #3530 - Add time option to traffic_ctl host down.
#3531 - Doc: Unify ":unit:" to ":units".
#3532 - Updated to new version of clang-format
#3533 - Doc: various fixes
diff --git a/CHANGELOG-8.0.2 b/CHANGELOG-8.0.2
index 9fff3e2..1e15928 100644
--- a/CHANGELOG-8.0.2
+++ b/CHANGELOG-8.0.2
@@ -2,7 +2,7 @@ Changes with Apache Traffic Server 8.0.2
#3601 - Add TLSv1.3 cipher suites for OpenSSL-1.1.1
#3927 - cppapi :InterceptPlugin fix
#3939 - Make sure the index stays positive
- #4217 - Fix a regression in the traffic_ctl host status subcommand.
+ #4217 - Fix a regression in the traffic_ctl host status subcommand.
#4369 - Doc: Fix doc build to work with Sphinx 1.8.
#4541 - Doc minor fixes.
#4700 - sslheaders experimental plugin: fix doc typo, improve container use.
diff --git a/doc/admin-guide/plugins/cachekey.en.rst
b/doc/admin-guide/plugins/cachekey.en.rst
index 0b631d5..5d8b6a0 100644
--- a/doc/admin-guide/plugins/cachekey.en.rst
+++ b/doc/admin-guide/plugins/cachekey.en.rst
@@ -582,7 +582,7 @@ Cacheurl plugin to cachekey plugin migration
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
The plugin `cachekey` was not meant to replace the cacheurl plugin in terms of
having exactly the same cache key strings generated. It just allows the
operator to exctract elements from the HTTP URI in the same way the `cacheurl`
does (through a regular expression, please see `<capture_definition>` above).
-The following examples demonstrate different ways to achieve `cacheurl`
compatibility on a cache key string level in order to avoid invalidation of the
cache.
+The following examples demonstrate different ways to achieve `cacheurl`
compatibility on a cache key string level in order to avoid invalidation of the
cache.
The operator could use `--capture-path-uri`, `--capture-path`,
`--capture-prefix-uri`, `--capture-prefix` to capture elements from the URI,
path and authority elements.
diff --git a/doc/admin-guide/plugins/lua.en.rst
b/doc/admin-guide/plugins/lua.en.rst
index 7bc17a9..8369fbd 100644
--- a/doc/admin-guide/plugins/lua.en.rst
+++ b/doc/admin-guide/plugins/lua.en.rst
@@ -2253,7 +2253,7 @@ ts.http.resp_transform.set_upstream_watermark_bytes
**context:** transform handler
-**description**: This function can be used to set the watermark bytes of the
upstream transform buffer.
+**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.
@@ -3766,4 +3766,3 @@ More docs
* https://github.com/portl4t/ts-lua
`TOP <#ts-lua-plugin>`_
-
diff --git a/doc/appendices/command-line/traffic_layout.en.rst
b/doc/appendices/command-line/traffic_layout.en.rst
index f9dbe13..f660cad 100644
--- a/doc/appendices/command-line/traffic_layout.en.rst
+++ b/doc/appendices/command-line/traffic_layout.en.rst
@@ -50,7 +50,7 @@ First we need to create a runroot. It can be created simply
by calling command `
traffic_layout init --path /path/to/runroot
-A runroot will be created in ``/path/to/runroot``, available for other
programs to use.
+A runroot will be created in ``/path/to/runroot``, available for other
programs to use.
If the path is not specified, the current working directory will be used.
To run traffic_manager, for example, using the runroot, there are several ways:
@@ -70,10 +70,10 @@ Subcommands
init
----
-Use the current working directory or the specific path to create runroot.
+Use the current working directory or the specific path to create runroot.
The path can be absolute or relative.
-workflow:
+workflow:
#. Create a sandbox directory for programs to run under.
#. Copy and symlink build time directories and files to the sandbox,
allowing users to modify freely.
#. Emit a YAML file that defines layout structure for other programs to
use (relative path).
diff --git a/doc/developer-guide/internal-libraries/ArgParser.en.rst
b/doc/developer-guide/internal-libraries/ArgParser.en.rst
index b01ac02..9594e7e 100644
--- a/doc/developer-guide/internal-libraries/ArgParser.en.rst
+++ b/doc/developer-guide/internal-libraries/ArgParser.en.rst
@@ -58,7 +58,7 @@ The parser can be created simply by calling:
ts::ArgParser parser;
-or initialize with the following arguments:
+or initialize with the following arguments:
*name, help description, environment variable, argument number expected,
function*
.. code-block:: cpp
@@ -343,7 +343,7 @@ This program will have such functionality:
init_command.add_command("subinit", "sub initialize");
parser.add_command("remove", "remove things").add_option("--path",
"-p", "specify the path", "HOME", 1);
-
+
ts::Arguments parsed_data = parser.parse(argv);
parsed_data.invoke();
...
diff --git a/doc/ext/traffic-server.py b/doc/ext/traffic-server.py
index ce1e1e4..24d9ef6 100644
--- a/doc/ext/traffic-server.py
+++ b/doc/ext/traffic-server.py
@@ -409,7 +409,7 @@ def setup(app):
app.add_crossref_type('configfile', 'file',
objname='Configuration file',
indextemplate='pair: %s; Configuration files')
-
+
# Very ugly, but as of Sphinx 1.8 it must be done. There is an `override`
option to add_crossref_type
# but it only applies to the directive, not the role (`file` in this
case). If this isn't cleared
# explicitly the build will fail out due to the conflict. In this case,
since the role action is the
diff --git a/rc/trafficserver.in b/rc/trafficserver.in
index b5036d9..2d4e648 100644
--- a/rc/trafficserver.in
+++ b/rc/trafficserver.in
@@ -101,7 +101,7 @@ TS_ROOT=${TS_ROOT:-$TS_PREFIX}
# ####################################
# run root is not used by default
# set this value if using a custom layout structure
-# TS_RUNROOT=""
+# TS_RUNROOT=""
# TS_BASE is offset inside the file system from where the layout starts
# For standard installations TS_BASE will be empty
@@ -292,7 +292,7 @@ rc_start_hook()
return $?
}
-# Make sure the NOFILES limit is set high in case this process is not
+# Make sure the NOFILES limit is set high in case this process is not
# started from a logged in prompt
ulimit -n 500000
diff --git a/tests/README.md b/tests/README.md
index 8d07029..93f3fe4 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -6,8 +6,8 @@ This directory contains different tests for Apache
Trafficserver. It is recommen
## Layout
The current layout is:
-**gold_tests/** - contains all the TSQA v4 based tests that run on the
Reusable Gold Testing System (AuTest)
-**tools/** - contains programs used to help with testing.
+**gold_tests/** - contains all the TSQA v4 based tests that run on the
Reusable Gold Testing System (AuTest)
+**tools/** - contains programs used to help with testing.
**include/** - contains headers used for unit testing.
## Scripts
diff --git a/tests/gold_tests/autest-site/microserver.test.ext
b/tests/gold_tests/autest-site/microserver.test.ext
index bef027f..e8d4949 100644
--- a/tests/gold_tests/autest-site/microserver.test.ext
+++ b/tests/gold_tests/autest-site/microserver.test.ext
@@ -177,7 +177,7 @@ def MakeOriginServer(obj, name, port=None, s_port=None,
ip='INADDR_LOOPBACK', de
command += " --cert {0}".format(cert)
command += " --s_port {0}".format(s_port)
- # this might break if user specifies both both and ssl
+ # this might break if user specifies both both and ssl
if not ssl: # in both or HTTP only mode
if not port:
port = get_port(p, "Port")
diff --git a/tests/gold_tests/autest-site/traffic_replay.test.ext
b/tests/gold_tests/autest-site/traffic_replay.test.ext
index 340fae9..0779dd5 100644
--- a/tests/gold_tests/autest-site/traffic_replay.test.ext
+++ b/tests/gold_tests/autest-site/traffic_replay.test.ext
@@ -16,7 +16,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# default 'mixed' for connection type since it doesn't hurt
+# default 'mixed' for connection type since it doesn't hurt
def Replay(obj, name, replay_dir, key=None, cert=None, conn_type='mixed',
options={}):
# ATS setup - one line because we leave records and remap config to user
ts = obj.MakeATSProcess("ts", select_ports=False) # select ports can be
disabled once we add ssl port selection in extension
@@ -61,7 +61,7 @@ def Replay(obj, name, replay_dir, key=None, cert=None,
conn_type='mixed', option
if not cert:
cert = os.path.join(obj.Variables["AtsTestToolsDir"], "microserver",
"ssl", "server.crt")
-
+
command = 'traffic-replay --log_dir {0} --type {1} --verify --host {2}
--port {3} --s_port {4} '.format(data_dir, conn_type, hostIP,
ts.Variables.port, ts.Variables.ssl_port)
if key:
diff --git a/tests/tools/README.md b/tests/tools/README.md
index 4e7e208..bb3e34c 100644
--- a/tests/tools/README.md
+++ b/tests/tools/README.md
@@ -7,21 +7,21 @@ Note these Tools require python 3.4 or better.
Replay client to replay session logs.
-Usage:
+Usage:
python3.5 traffic-replay/ -type <nossl|ssl|h2|random> -log_dir /path/to/log -v
-Session Log format (in JSON):
+Session Log format (in JSON):
- {"version": "0.1",
+ {"version": "0.1",
"txns": [
- {"request": {"headers": "POST ……\r\n\r\n", "timestamp": "..", "body":
".."},
+ {"request": {"headers": "POST ……\r\n\r\n", "timestamp": "..", "body":
".."},
"response": {"headers": "HTTP/1.1..\r\n\r\n", "timestamp": "..",
"body": ".."},
- "uuid": "1"},
- {"request": {"headers": "POST ..….\r\n\r\n", "timestamp": "..",
"body": ".."},
- "response": {"headers": "HTTP/1.1..\r\nr\n", "timestamp": "..",
"body": ".."},
+ "uuid": "1"},
+ {"request": {"headers": "POST ..….\r\n\r\n", "timestamp": "..",
"body": ".."},
+ "response": {"headers": "HTTP/1.1..\r\nr\n", "timestamp": "..",
"body": ".."},
"uuid": "2"}
- ],
- "timestamp": "....",
+ ],
+ "timestamp": "....",
"encoding": "...."}
Configuration: The configuration required to run traffic-replay can be
specified in traffic-replay/Config.py
diff --git a/tools/traffic_via.pl b/tools/traffic_via.pl
index 6eee2a6..7dcf39a 100755
--- a/tools/traffic_via.pl
+++ b/tools/traffic_via.pl
@@ -25,9 +25,9 @@
# 1. Pass Via Header with -s option \n";
# traffic_via [-s viaheader]";
# or
-# 2. Pipe curl output
+# 2. Pipe curl output
# curl -v -H "X-Debug: Via" http://ats_server:port 2>&1| ./traffic_via.pl
-#
+#
use strict;
use warnings;
@@ -41,7 +41,7 @@ my $help;
my @proxy_header_array = (
{
"Request headers received from client:",
- {
+ {
'I' => "If Modified Since (IMS)",
'C' => "cookie",
'E' => "error in request",
@@ -81,7 +81,7 @@ my @proxy_header_array = (
},
{
"Proxy operation result:",
- {
+ {
'R' => "origin server revalidated",
' ' => "unknown?",
'S' => "served",
@@ -148,7 +148,7 @@ my @proxy_header_array = (
'S' => "connection opened successfully",
'F' => "connection open failed",
},
-
+
},
{
"Origin server connection status:",
@@ -181,7 +181,7 @@ if (@ARGV == 0) {
#Pattern matching for Via
if ($element =~ /Via:(.*)\[(.*)\]/) {
#Search and grep via header
- $via_string = $2;
+ $via_string = $2;
chomp($via_string);
print "Via Header is [$via_string]";
decode_via_header($via_string);
@@ -191,7 +191,7 @@ if (@ARGV == 0) {
usage() if (!GetOptions('s=s' => \$via_header,
'help|?' => \$help) or
defined $help);
-
+
if (defined $via_header) {
#if passed through commandline dashed argument
print "Via Header is [$via_header]";
@@ -207,10 +207,10 @@ sub decode_via_header {
my $newHeader;
#Check via header syntax
- if ($header =~ /([a-zA-Z: ]+)/) {
+ if ($header =~ /([a-zA-Z: ]+)/) {
#Get via header length
$hdrLength = length($header);
-
+
# Valid Via header length is 24 or 6.
# When Via header length is 24, it will have both proxy request header
result and operational results.
if ($hdrLength == 24) {
@@ -228,8 +228,8 @@ sub decode_via_header {
}
convert_header_to_array($newHeader);
}
-
-
+
+
}
sub convert_header_to_array {
@@ -239,7 +239,7 @@ sub convert_header_to_array {
while ($viaHeader =~ /(.)/g) {
#Only capital letters indicate flags
if ($1 !~ m/[a-z]+/) {
- push(@ResultArray, $1);
+ push(@ResultArray, $1);
}
}
print "\nVia Header details: \n";
@@ -256,18 +256,18 @@ sub get_via_header_flags {
my @flagKeys;
my %flags;
my @keys;
-
+
my @array = @$arrayName;
-
+
%flagValues = %{$array[$inputIndex]};
@flagKeys = keys (%flagValues);
-
+
foreach my $keyEntry ( @flagKeys ) {
printf ("%-55s", $keyEntry);
%flags = %{$flagValues{$keyEntry}};
@keys = keys (%flags);
foreach my $key ( @keys ) {
- if ($key =~ /$flag/) {
+ if ($key =~ /$flag/) {
#print $flags{$key};
printf("%s",$flags{$key});
print "\n";
