[trafficserver] branch 8.1.x updated: free(map) -> delete map

2020-03-24 Thread zwoop 
This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch 8.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/8.1.x by this push:
 new c351e20  free(map) -> delete map
c351e20 is described below

commit c351e20f241878f21719f7df9975e1ec4baf7314
Author: bneradt 
AuthorDate: Tue Mar 24 21:19:56 2020 +

free(map) -> delete map

Fixing an ASan reported alloc-dealloc-mismatch in which map was
constructed with new but destructed with free instead of delete
in certinfo_map_free.

(cherry picked from commit 134fb609351c16656089d68a550f41c280d05c2d)
---
 iocore/net/OCSPStapling.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/iocore/net/OCSPStapling.cc b/iocore/net/OCSPStapling.cc
index 55060be..eb6c240 100644
--- a/iocore/net/OCSPStapling.cc
+++ b/iocore/net/OCSPStapling.cc
@@ -71,7 +71,7 @@ certinfo_map_free(void * /*parent*/, void *ptr, 
CRYPTO_EX_DATA * /*ad*/, int /*i
 ink_mutex_destroy(>second->stapling_mutex);
 OPENSSL_free(iter->second);
   }
-  free(map);
+  delete map;
 }
 
 static int ssl_stapling_index = -1;

[trafficserver] branch 9.0.x updated: free(map) -> delete map

2020-03-24 Thread zwoop 
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 40350ef  free(map) -> delete map
40350ef is described below

commit 40350efc0b9e4dd1f9da55d0e0e81413d1cf9e6c
Author: bneradt 
AuthorDate: Tue Mar 24 21:19:56 2020 +

free(map) -> delete map

Fixing an ASan reported alloc-dealloc-mismatch in which map was
constructed with new but destructed with free instead of delete
in certinfo_map_free.

(cherry picked from commit 134fb609351c16656089d68a550f41c280d05c2d)
---
 iocore/net/OCSPStapling.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/iocore/net/OCSPStapling.cc b/iocore/net/OCSPStapling.cc
index 55e2b7e..d39bf6b 100644
--- a/iocore/net/OCSPStapling.cc
+++ b/iocore/net/OCSPStapling.cc
@@ -74,7 +74,7 @@ certinfo_map_free(void * /*parent*/, void *ptr, 
CRYPTO_EX_DATA * /*ad*/, int /*i
 ink_mutex_destroy(>second->stapling_mutex);
 OPENSSL_free(iter->second);
   }
-  free(map);
+  delete map;
 }
 
 static int ssl_stapling_index = -1;

[trafficserver] branch master updated: free(map) -> delete map

2020-03-24 Thread rrm 
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 134fb60  free(map) -> delete map
134fb60 is described below

commit 134fb609351c16656089d68a550f41c280d05c2d
Author: bneradt 
AuthorDate: Tue Mar 24 21:19:56 2020 +

free(map) -> delete map

Fixing an ASan reported alloc-dealloc-mismatch in which map was
constructed with new but destructed with free instead of delete
in certinfo_map_free.
---
 iocore/net/OCSPStapling.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/iocore/net/OCSPStapling.cc b/iocore/net/OCSPStapling.cc
index 55e2b7e..d39bf6b 100644
--- a/iocore/net/OCSPStapling.cc
+++ b/iocore/net/OCSPStapling.cc
@@ -74,7 +74,7 @@ certinfo_map_free(void * /*parent*/, void *ptr, 
CRYPTO_EX_DATA * /*ad*/, int /*i
 ink_mutex_destroy(>second->stapling_mutex);
 OPENSSL_free(iter->second);
   }
-  free(map);
+  delete map;
 }
 
 static int ssl_stapling_index = -1;

[trafficserver] branch 8.1.x updated: Disable the chunked_encoding test

2020-03-24 Thread zwoop 
This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch 8.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/8.1.x by this push:
 new b3c86eb  Disable the chunked_encoding test
b3c86eb is described below

commit b3c86ebf0d4d91752f86acce12023cc30e602c45
Author: Bryan Call 
AuthorDate: Thu Feb 20 12:00:58 2020 -0800

Disable the chunked_encoding test

(cherry picked from commit a558db594f54f4b706fe319b587eab5d6ed33fd8)

 Conflicts:
tests/gold_tests/chunked_encoding/chunked_encoding.test.py
---
 tests/gold_tests/chunked_encoding/chunked_encoding.test.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/gold_tests/chunked_encoding/chunked_encoding.test.py 
b/tests/gold_tests/chunked_encoding/chunked_encoding.test.py
index 5803d62..1a7cde7 100644
--- a/tests/gold_tests/chunked_encoding/chunked_encoding.test.py
+++ b/tests/gold_tests/chunked_encoding/chunked_encoding.test.py
@@ -23,7 +23,8 @@ Test a basic remap of a http connection
 # need Curl
 Test.SkipUnless(
 Condition.HasProgram("curl", "Curl need to be installed on system for this 
test to work"),
-Condition.HasCurlFeature('http2')
+Condition.HasCurlFeature('http2'),
+Condition.HasProgram("xxxZZZxxx", "disable the test until it is working")
 )
 Test.ContinueOnFail = True

[trafficserver] branch 8.1.x updated: Updating for 8.1.0 release

2020-03-24 Thread zwoop 
This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch 8.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/8.1.x by this push:
 new c73ccac  Updating for 8.1.0 release
c73ccac is described below

commit c73ccacf0932125641e3c9861470567024c3acb0
Author: Leif Hedstrom 
AuthorDate: Tue Mar 24 15:56:57 2020 -0600

Updating for 8.1.0 release
---
 CHANGELOG-8.1.0 | 33 +
 configure.ac|  4 ++--
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG-8.1.0 b/CHANGELOG-8.1.0
new file mode 100644
index 000..056af85
--- /dev/null
+++ b/CHANGELOG-8.1.0
@@ -0,0 +1,33 @@
+Changes with Apache Traffic Server 8.1.0
+  #4028 - proxy.config.http.connect_attempts_timeout tracks TTBF instead of 
connect
+  #4203 - Allow enabling MPTCP on a listening socket through the records.config
+  #4437 - Adds the log tag cqint for internal requests
+  #4762 - Fix OCSP stapling with dual cert
+  #4869 - Cleanup: remove lib/cppapi from clang-format, it's been moved.
+  #4874 - Avoid ats_malloc in unmarshal
+  #4924 - lua plugin: add support for relative path scripts; moves inline 
script to switch
+  #5058 - Fixed use after free when running regression under ASAN
+  #5122 - fix crash in CacheVC::openReadFromWriter
+  #5131 - Do not run clang-format for @default_stack_size@
+  #5149 - Add nullptr check on ConfigProcessor::release()
+  #5163 - Fix memleak in ProcessManager::stop()
+  #5209 - Allows logging of negative values
+  #5227 - Normalize on negative value for milestone metrics
+  #5234 - Correct interpretation of proxy.config.ssl.client.verify.server
+  #5235 - Fix lost pending_actions causing actions on stale objects.
+  #5236 - Update documentation for SSL VERIFY hooks.
+  #5242 - Adds a missing header field for the tcpinfo log
+  #5329 - Fixes clang-analyzer error dereferencing nullptr in parent
+  #5348 - Don't assign if this and other are the same object
+  #5354 - Password can not be nullptr here, so don't check
+  #5811 - Fix no_activity timeout for server session reuse.
+  #6154 - tslua: Exposes set/get method for server request objects
+  #6182 - tslua: Exposes set/get version for server request objects
+  #6191 - Limit this check to Linux, where ldd always works
+  #6264 - Change HTTP/2 error rate log to warning
+  #6294 - Enhance Connection Collapse in ATS core - back port to 8.x
+  #6328 - Document the order of the X-Cache header
+  #6343 - Fixes an assertion failure when 
proxy.config.http.no_dns_just_forward_to_parent is enabled
+  #6392 - Free TSMgmtString after using it.
+  #6534 - Ignore MgmtMessageHdr if ProcessManager is not running
+  #6535 - Add MIMEHdr Garbage Collection to HPACK Dynamic Table
diff --git a/configure.ac b/configure.ac
index 285a54d..c26c54f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,8 +32,8 @@
 # Version number is calculated as MAJOR * 100 + MINOR * 1000 + MICRO
 # Version string is in the form of MAJOR.MINOR.MICRO[sufix]
 #
-m4_define([TS_VERSION_S],[8.0.7])
-m4_define([TS_VERSION_N],[807])
+m4_define([TS_VERSION_S],[8.1.0])
+m4_define([TS_VERSION_N],[8001000])
 
 AC_INIT([Apache Traffic Server], TS_VERSION_S(), 
[d...@trafficserver.apache.org], 
[trafficserver],[http://trafficserver.apache.org])
 AC_PREREQ([2.59])

[trafficserver] branch 9.0.x updated: Updated CHANGELOG

2020-03-24 Thread zwoop 
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 18e8be6  Updated CHANGELOG
18e8be6 is described below

commit 18e8be6fd620b8d034fa4217a49f72d95f65870f
Author: Leif Hedstrom 
AuthorDate: Tue Mar 24 15:22:19 2020 -0600

Updated CHANGELOG
---
 CHANGELOG-9.0.0 | 42 +-
 1 file changed, 13 insertions(+), 29 deletions(-)

diff --git a/CHANGELOG-9.0.0 b/CHANGELOG-9.0.0
index aadad6f..897e6bc 100644
--- a/CHANGELOG-9.0.0
+++ b/CHANGELOG-9.0.0
@@ -6,6 +6,7 @@ Changes with Apache Traffic Server 9.0.0
   #3777 - Bump version on master to v9.0.0
   #3819 - Upstream max conn upgrade
   #3851 - For atscppapi::AsyncTimer, pass the thread pool for execution to the 
constructor, …
+  #3899 - Add a --reason tag option to the host subcommand
   #3900 - ts/Extendible and AcidPtr classes
   #3901 - MemArena: Add make method to construct objects in the arena.
   #3907 - IntrusiveDList: Refreshed for C++ eleventy, added const_iterator.
@@ -29,7 +30,6 @@ Changes with Apache Traffic Server 9.0.0
   #4003 - Fix another crash on shutdown
   #4008 - Add support for 'fwd' value to X-Debug header, and move to later 
hook any deletion of X-Debug header from client request.
   #4020 - Add logic to clean up vios on HttpSM shutdown
-  #4028 - proxy.config.http.connect_attempts_timeout tracks TTBF instead of 
connect
   #4029 - Replace TSHashTable in server session management with 
IntrusiveHashMap
   #4033 - Removes remnants of dprintf support
   #4039 - Enable ECDH explicitly only if OpenSSL version is v1.0.2 or lower
@@ -62,6 +62,7 @@ Changes with Apache Traffic Server 9.0.0
   #4176 - TextView: Add support for use as "Source" in STL containers.
   #4177 - IntrusiveDList: Add ptr_ref_cast to make inheritance easier
   #4184 - Update to changelog generation tool to not require milestone to be 
closed
+  #4185 - Amend Layer 4 routing documentation
   #4186 - clang-format: Another one that slipped through.
   #4187 - Plugins: Cleanup up dependencies on core headers - sslheaders
   #4190 - Plugins: Cleanup up dependencies on core headers - authproxy
@@ -70,6 +71,7 @@ Changes with Apache Traffic Server 9.0.0
   #4194 - Remove ssl_cert_loader.  Certifier is more complete version.
   #4198 - Cleanup, and adds support for new luajit option
   #4206 - ts_file: Simple sketch of std::filesystem for internal use.
+  #4217 - Fix a regression in the traffic_ctl host status subcommand
   #4220 - IntrusiveHashMap: Inserts preserve order for equal keys, as with 
std::multimap
   #4221 - IntrusiveHashMap: Fix for find false positive in some cases.
   #4226 - HttpSessionManager: Fix potential infinite loop problem.
@@ -121,7 +123,6 @@ Changes with Apache Traffic Server 9.0.0
   #4431 - TCL: All ink_hash_table in proxy converted to use STL
   #4433 - YAML: LibSWOC upgrade for TextView.
   #4434 - YAML: move MemSpan to external C++ library.
-  #4437 - Adds the log tag cqint for internal requests
   #4448 - YAML: TextView upgrade revisited.
   #4449 - YAML: Inline BufferWriter formatting functions.
   #4450 - Improve BufferWriter logic in HttpTransactHeaders.cc
@@ -184,6 +185,7 @@ Changes with Apache Traffic Server 9.0.0
   #4657 - TLS Bridge: Fix error where connect failure lead to a silent timeout.
   #4662 - Adds a reasonable rip-grep config file
   #4663 - Add back in the option to conf_remap the verify_server settings.
+  #4664 - Use hash string when it is provided for hashing
   #4666 - Allow empty fqdn in ssl_server_name for unset SNI case.
   #4667 - Add forward_route in ssl_server_name
   #4668 - Compare servers script for comparing responses from new and old 
versions of ATS
@@ -259,9 +261,7 @@ Changes with Apache Traffic Server 9.0.0
   #4858 - Removes the echo from installing pre-commit
   #4862 - Updates uri_signing docs to reflect new RFC changes
   #4866 - Remove start_HttpProxyServerBackDoor.
-  #4869 - Cleanup: remove lib/cppapi from clang-format, it's been moved.
   #4870 - Cleanup: Remove "hooks_on" and associated machinery.
-  #4874 - Avoid ats_malloc in unmarshal
   #4878 - Fix a segfault on mac, because of new ScheduleOn APIs
   #4879 - Clean up StrHeapDesc constructor.
   #4880 - Remove class StrTest, which is not used.
@@ -271,6 +271,7 @@ Changes with Apache Traffic Server 9.0.0
   #4895 - URI Signing Strips token from upstream if configured and string 
buffers are dynamically allocated
   #4897 - Uri signing regex as POSIX ERE
   #4901 - Update overridable config conversion logic.
+  #4902 - Adjust follow redirect logic to address a crash and avoid arguments 
shadowing
   #4903 - Adjust connection timeout for TLS
   #4909 - Update plugin API type conversions to support enums automatically.
   #4914 - DFA: Update DFA to use string_view.
@@ -278,7 +279,6 @@ Changes with Apache Traffic

[trafficserver] branch 9.0.x updated: better handling of TSVIO calls and TSVConnAbort (#6239)

2020-03-24 Thread zwoop 
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 15880ba  better handling of TSVIO calls and TSVConnAbort (#6239)
15880ba is described below

commit 15880badbc9a6d9617672c7cf8594671c6d0e3bf
Author: Brian Olsen 
AuthorDate: Fri Mar 20 10:40:02 2020 -0600

better handling of TSVIO calls and TSVConnAbort (#6239)

(cherry picked from commit 1181399556259b8fa27810de481eafb2c0bdd3a7)
---
 doc/admin-guide/plugins/slice.en.rst|   4 +-
 plugins/experimental/slice/Config.cc|   7 +-
 plugins/experimental/slice/Config.h |   1 +
 plugins/experimental/slice/Data.h   |  26 ++--
 plugins/experimental/slice/HttpHeader.cc|  17 +-
 plugins/experimental/slice/HttpHeader.h |  13 +-
 plugins/experimental/slice/Makefile.inc |   5 +-
 plugins/experimental/slice/Makefile.tsxs|   1 -
 plugins/experimental/slice/Range.cc |  11 +-
 plugins/experimental/slice/Range.h  |   4 +
 plugins/experimental/slice/Stage.h  |  77 ++---
 plugins/experimental/slice/client.cc| 175 +++--
 plugins/experimental/slice/client.h |   2 +
 plugins/experimental/slice/intercept.cc |  24 ++-
 plugins/experimental/slice/server.cc| 199 +---
 plugins/experimental/slice/slice.cc |  56 ++-
 plugins/experimental/slice/slice.h  |  11 ++
 plugins/experimental/slice/transfer.cc  | 147 +++--
 plugins/experimental/slice/transfer.h   |   3 +
 plugins/experimental/slice/util.cc  | 134 
 plugins/experimental/slice/{client.h => util.h} |  14 +-
 21 files changed, 600 insertions(+), 331 deletions(-)

diff --git a/doc/admin-guide/plugins/slice.en.rst 
b/doc/admin-guide/plugins/slice.en.rst
index dca442d..b131178 100644
--- a/doc/admin-guide/plugins/slice.en.rst
+++ b/doc/admin-guide/plugins/slice.en.rst
@@ -138,9 +138,9 @@ Under normal logging these slice block errors tend to show 
up as::
 By default more detailed stitching errors are written to ``diags.log``.
 Examples are as follows::
 
-ERROR: [slice.cc: 288] logSliceError(): 1555705573.639 reason="Non 206 
internal block response" uri="http://ats_ep/someasset.mp4; uas="curl" 
req_range="bytes=100-" norm_range="bytes 100-52428799/52428800" 
etag_exp="%221603934496%22" lm_exp="Fri, 19 Apr 2019 18:53:20 GMT" 
blk_range="2100-2199" status_got="206" cr_got="" 
etag_got="%221603934496%22" lm_got="" cc="no-store" via=""
+ERROR: [slice.cc: 288] logSliceError(): 1555705573.639 reason="Non 206 
internal block response" uri="http://ats_ep/someasset.mp4; uas="curl" 
req_range="bytes=100-" norm_range="bytes 100-52428799/52428800" 
etag_exp="%221603934496%22" lm_exp="Fri, 19 Apr 2019 18:53:20 GMT" 
blk_range="2100-2199" status_got="206" cr_got="" 
etag_got="%221603934496%22" lm_got="" cc="no-store" via=""
 
-ERROR: [server.cc: 288] logSliceError(): 157237.219 reason="Mismatch 
block Etag" uri="http://ats_ep/someasset.mp4; uas="curl" 
req_range="bytes=1092779033-1096299354" norm_range="bytes 
1092779033-1096299354/2147483648" etag_exp="%223719843648%22" lm_exp="Tue, 29 
Oct 2019 14:40:00 GMT" blk_range="109500-109599" status_got="206" 
cr_got="bytes 109500-109599/2147483648" etag_got="%223719853648%22" 
lm_got="Tue, 29 Oct 2019 17:26:40 GMT" cc="max-age=1" via=""
+ERROR: [server.cc: 288] logSliceError(): 157237.219 reason="Mismatch block 
Etag" uri="http://ats_ep/someasset.mp4; uas="curl" 
req_range="bytes=1092779033-1096299354" norm_range="bytes 
1092779033-1096299354/2147483648" etag_exp="%223719843648%22" lm_exp="Tue, 29 
Oct 2019 14:40:00 GMT" blk_range="109500-109599" status_got="206" 
cr_got="bytes 109500-109599/2147483648" etag_got="%223719853648%22" 
lm_got="Tue, 29 Oct 2019 17:26:40 GMT" cc="max-age=1" via=""
 
 Whether or how often these detailed log entries are written are
 configurable plugin options.
diff --git a/plugins/experimental/slice/Config.cc 
b/plugins/experimental/slice/Config.cc
index 6d27089..fb04ebb 100644
--- a/plugins/experimental/slice/Config.cc
+++ b/plugins/experimental/slice/Config.cc
@@ -98,13 +98,14 @@ Config::fromArgs(int const argc, char const *const argv[])
 {const_cast("remap-host"), required_argument, nullptr, 'r'},
 {const_cast("pace-errorlog"), required_argument, nullptr, 'p'},
 {const_cast("disable-errorlog"), no_argument, nullptr, 'd'},
+{const_cast("throttle"), no_argument, nullptr, 'o'},
 {nullptr, 0, nullptr, 0},
   };
 
   // getopt assumes args start at '1' so this hack is needed
   char *const *argvp = (const_cast(argv) - 1);
   for (;;) {
-int const opt = getopt_long(argc + 1, argvp,

[trafficserver] branch 9.0.x updated: Fixes some tls autests on macOS

2020-03-24 Thread zwoop 
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 57ac8d4  Fixes some tls autests on macOS
57ac8d4 is described below

commit 57ac8d4f212e2ef9745c1da91dc2938f1bc7ee0c
Author: Randall Meyer 
AuthorDate: Mon Mar 23 12:51:05 2020 -0700

Fixes some tls autests on macOS

on macOS, wc precedes output with spaces

(cherry picked from commit 290fe4bff10b04eb9d3cdeabd13ee9789e84a6d6)
---
 tests/gold_tests/tls/tls_client_cert.test.py | 2 +-
 tests/gold_tests/tls/tls_tunnel.test.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/gold_tests/tls/tls_client_cert.test.py 
b/tests/gold_tests/tls/tls_client_cert.test.py
index 6732c45..89a1f9b 100644
--- a/tests/gold_tests/tls/tls_client_cert.test.py
+++ b/tests/gold_tests/tls/tls_client_cert.test.py
@@ -175,7 +175,7 @@ tr2.Processes.Default.ReturnCode = 0
 # At that point the new sni settings are ready to go
 def sni_reload_done(tsenv):
   def done_reload(process, hasRunFor, **kw):
-cmd = "grep 'sni.yaml finished loading' {0} | wc -l > 
{1}/test.out".format(ts.Disk.diags_log.Name, Test.RunDirectory)
+cmd = "grep 'sni.yaml finished loading' {0} | wc -l  | sed -e 's/ //g'> 
{1}/test.out".format(ts.Disk.diags_log.Name, Test.RunDirectory)
 retval = subprocess.run(cmd, shell=True, env=tsenv)
 if retval.returncode == 0:
   cmd ="if [ -f {0}/test.out -a \"`cat {0}/test.out`\" = \"2\" ] ; then 
true; else false; fi".format(Test.RunDirectory)
diff --git a/tests/gold_tests/tls/tls_tunnel.test.py 
b/tests/gold_tests/tls/tls_tunnel.test.py
index 0a7196f..3811a9b 100644
--- a/tests/gold_tests/tls/tls_tunnel.test.py
+++ b/tests/gold_tests/tls/tls_tunnel.test.py
@@ -152,7 +152,7 @@ trreload.Processes.Default.ReturnCode = 0
 # At that point the new sni settings are ready to go
 def sni_reload_done(tsenv):
   def done_reload(process, hasRunFor, **kw):
-cmd = "grep 'sni.yaml finished loading' {0} | wc -l > 
{1}/test.out".format(ts.Disk.diags_log.Name, Test.RunDirectory)
+cmd = "grep 'sni.yaml finished loading' {0} | wc -l | sed -e 's/ //g' > 
{1}/test.out".format(ts.Disk.diags_log.Name, Test.RunDirectory)
 retval = subprocess.run(cmd, shell=True, env=tsenv)
 if retval.returncode == 0:
   cmd ="if [ -f {0}/test.out -a \"`cat {0}/test.out`\" = \"2\" ] ; then 
true; else false; fi".format(Test.RunDirectory)

[trafficserver] branch 9.0.x updated: Removes copypasta curl text from tests and removes checks for curl

2020-03-24 Thread zwoop 
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 23f493d  Removes copypasta curl text from tests and removes checks for 
curl
23f493d is described below

commit 23f493dc0d986ee5857a222e98dbb219109a9d62
Author: Randall Meyer 
AuthorDate: Tue Mar 24 10:56:25 2020 -0700

Removes copypasta curl text from tests and removes checks for curl

It was decided that curl and nc are a base requirement for autest back in
6c1a90f4f209a02cf1345ac4c20e2e67c4c58db1

(cherry picked from commit c623884e6e608d7a300f9896eb35107188d0f789)
---
 tests/gold_tests/cache/cache-generation-disjoint.test.py  | 2 +-
 tests/gold_tests/chunked_encoding/chunked_encoding.test.py| 2 +-
 tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py | 4 +---
 tests/gold_tests/h2/h2disable.test.py | 1 -
 tests/gold_tests/h2/h2disable_no_accept_threads.test.py   | 1 -
 tests/gold_tests/h2/h2enable.test.py  | 1 -
 tests/gold_tests/h2/h2enable_no_accept_threads.test.py| 1 -
 tests/gold_tests/h2/http2.test.py | 2 +-
 tests/gold_tests/h2/http2_priority.test.py| 1 -
 tests/gold_tests/h2/nghttp.test.py| 2 +-
 tests/gold_tests/pluginTest/multiplexer/multiplexer.test.py   | 2 +-
 tests/gold_tests/timeout/active_timeout.test.py   | 1 -
 tests/gold_tests/timeout/inactive_timeout.test.py | 1 -
 tests/gold_tests/tls/tls_client_versions.test.py  | 1 -
 14 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/tests/gold_tests/cache/cache-generation-disjoint.test.py 
b/tests/gold_tests/cache/cache-generation-disjoint.test.py
index 7c6bd21..e6da37b 100644
--- a/tests/gold_tests/cache/cache-generation-disjoint.test.py
+++ b/tests/gold_tests/cache/cache-generation-disjoint.test.py
@@ -21,7 +21,7 @@ import uuid
 Test.Summary = '''
 Test that the same URL path in different cache generations creates disjoint 
objects
 '''
-# need Curl
+
 Test.ContinueOnFail = True
 # Define default ATS
 ts = Test.MakeATSProcess("ts")
diff --git a/tests/gold_tests/chunked_encoding/chunked_encoding.test.py 
b/tests/gold_tests/chunked_encoding/chunked_encoding.test.py
index 9037778..60cd4dc 100644
--- a/tests/gold_tests/chunked_encoding/chunked_encoding.test.py
+++ b/tests/gold_tests/chunked_encoding/chunked_encoding.test.py
@@ -19,7 +19,7 @@
 Test.Summary = '''
 Test chunked encoding processing
 '''
-# need Curl with HTTP/2
+
 Test.SkipUnless(
 Condition.HasCurlFeature('http2')
 )
diff --git a/tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py 
b/tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py
index 1cd9297..75d8a79 100644
--- a/tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py
+++ b/tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py
@@ -20,11 +20,9 @@ import os
 Test.Summary = '''
 Test interaction of H2 and chunked encoding
 '''
-# need Curl
+
 Test.SkipUnless(
 Condition.HasProgram("nghttp", "Nghttp need to be installed on system for 
this test to work"),
-Condition.HasProgram("nc", "Nc needs to be installed on this system for 
this test to work"),
-Condition.HasProgram("curl", "Curl need to be installed on system for this 
test to work"),
 Condition.HasCurlFeature('http2')
 )
 Test.ContinueOnFail = True
diff --git a/tests/gold_tests/h2/h2disable.test.py 
b/tests/gold_tests/h2/h2disable.test.py
index 0b0ac8b..3fdc0e3 100644
--- a/tests/gold_tests/h2/h2disable.test.py
+++ b/tests/gold_tests/h2/h2disable.test.py
@@ -20,7 +20,6 @@ Test.Summary = '''
 Test disabling H2 on a per domain basis
 '''
 
-# need Curl
 Test.SkipUnless(
 Condition.HasCurlFeature('http2')
 )
diff --git a/tests/gold_tests/h2/h2disable_no_accept_threads.test.py 
b/tests/gold_tests/h2/h2disable_no_accept_threads.test.py
index 8d805af..fe508a6 100644
--- a/tests/gold_tests/h2/h2disable_no_accept_threads.test.py
+++ b/tests/gold_tests/h2/h2disable_no_accept_threads.test.py
@@ -20,7 +20,6 @@ Test.Summary = '''
 Test disabling H2 on a per domain basis
 '''
 
-# need Curl
 Test.SkipUnless(
 Condition.HasCurlFeature('http2')
 )
diff --git a/tests/gold_tests/h2/h2enable.test.py 
b/tests/gold_tests/h2/h2enable.test.py
index a44c271..07964af 100644
--- a/tests/gold_tests/h2/h2enable.test.py
+++ b/tests/gold_tests/h2/h2enable.test.py
@@ -20,7 +20,6 @@ Test.Summary = '''
 Test enabling H2 on a per domain basis
 '''
 
-# need Curl
 Test.SkipUnless(
 Condition.HasCurlFeature('http2')
 )
diff --git a/tests/gold_tests/h2/h2enable_no_accept_threads.test.py 
b/tests/gold_tests/h2/h2enable_no_accept_threads.test.py
index 7f82c47..9e64acc 100644
--- a/tests/gold_tests/h2/h2enable_no_accept_threads.test.py
+++

[trafficserver] branch master updated: Removes copypasta curl text from tests and removes checks for curl

2020-03-24 Thread rrm 
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 c623884  Removes copypasta curl text from tests and removes checks for 
curl
c623884 is described below

commit c623884e6e608d7a300f9896eb35107188d0f789
Author: Randall Meyer 
AuthorDate: Tue Mar 24 10:56:25 2020 -0700

Removes copypasta curl text from tests and removes checks for curl

It was decided that curl and nc are a base requirement for autest back in
6c1a90f4f209a02cf1345ac4c20e2e67c4c58db1
---
 tests/gold_tests/cache/cache-generation-disjoint.test.py  | 2 +-
 tests/gold_tests/chunked_encoding/chunked_encoding.test.py| 2 +-
 tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py | 4 +---
 tests/gold_tests/h2/h2disable.test.py | 1 -
 tests/gold_tests/h2/h2disable_no_accept_threads.test.py   | 1 -
 tests/gold_tests/h2/h2enable.test.py  | 1 -
 tests/gold_tests/h2/h2enable_no_accept_threads.test.py| 1 -
 tests/gold_tests/h2/http2.test.py | 2 +-
 tests/gold_tests/h2/http2_priority.test.py| 1 -
 tests/gold_tests/h2/nghttp.test.py| 2 +-
 tests/gold_tests/pluginTest/multiplexer/multiplexer.test.py   | 2 +-
 tests/gold_tests/timeout/active_timeout.test.py   | 1 -
 tests/gold_tests/timeout/inactive_timeout.test.py | 1 -
 tests/gold_tests/tls/tls_client_versions.test.py  | 1 -
 14 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/tests/gold_tests/cache/cache-generation-disjoint.test.py 
b/tests/gold_tests/cache/cache-generation-disjoint.test.py
index 7c6bd21..e6da37b 100644
--- a/tests/gold_tests/cache/cache-generation-disjoint.test.py
+++ b/tests/gold_tests/cache/cache-generation-disjoint.test.py
@@ -21,7 +21,7 @@ import uuid
 Test.Summary = '''
 Test that the same URL path in different cache generations creates disjoint 
objects
 '''
-# need Curl
+
 Test.ContinueOnFail = True
 # Define default ATS
 ts = Test.MakeATSProcess("ts")
diff --git a/tests/gold_tests/chunked_encoding/chunked_encoding.test.py 
b/tests/gold_tests/chunked_encoding/chunked_encoding.test.py
index 9037778..60cd4dc 100644
--- a/tests/gold_tests/chunked_encoding/chunked_encoding.test.py
+++ b/tests/gold_tests/chunked_encoding/chunked_encoding.test.py
@@ -19,7 +19,7 @@
 Test.Summary = '''
 Test chunked encoding processing
 '''
-# need Curl with HTTP/2
+
 Test.SkipUnless(
 Condition.HasCurlFeature('http2')
 )
diff --git a/tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py 
b/tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py
index 1cd9297..75d8a79 100644
--- a/tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py
+++ b/tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py
@@ -20,11 +20,9 @@ import os
 Test.Summary = '''
 Test interaction of H2 and chunked encoding
 '''
-# need Curl
+
 Test.SkipUnless(
 Condition.HasProgram("nghttp", "Nghttp need to be installed on system for 
this test to work"),
-Condition.HasProgram("nc", "Nc needs to be installed on this system for 
this test to work"),
-Condition.HasProgram("curl", "Curl need to be installed on system for this 
test to work"),
 Condition.HasCurlFeature('http2')
 )
 Test.ContinueOnFail = True
diff --git a/tests/gold_tests/h2/h2disable.test.py 
b/tests/gold_tests/h2/h2disable.test.py
index 0b0ac8b..3fdc0e3 100644
--- a/tests/gold_tests/h2/h2disable.test.py
+++ b/tests/gold_tests/h2/h2disable.test.py
@@ -20,7 +20,6 @@ Test.Summary = '''
 Test disabling H2 on a per domain basis
 '''
 
-# need Curl
 Test.SkipUnless(
 Condition.HasCurlFeature('http2')
 )
diff --git a/tests/gold_tests/h2/h2disable_no_accept_threads.test.py 
b/tests/gold_tests/h2/h2disable_no_accept_threads.test.py
index 8d805af..fe508a6 100644
--- a/tests/gold_tests/h2/h2disable_no_accept_threads.test.py
+++ b/tests/gold_tests/h2/h2disable_no_accept_threads.test.py
@@ -20,7 +20,6 @@ Test.Summary = '''
 Test disabling H2 on a per domain basis
 '''
 
-# need Curl
 Test.SkipUnless(
 Condition.HasCurlFeature('http2')
 )
diff --git a/tests/gold_tests/h2/h2enable.test.py 
b/tests/gold_tests/h2/h2enable.test.py
index cb6658b..efcaf34 100644
--- a/tests/gold_tests/h2/h2enable.test.py
+++ b/tests/gold_tests/h2/h2enable.test.py
@@ -20,7 +20,6 @@ Test.Summary = '''
 Test enabling H2 on a per domain basis
 '''
 
-# need Curl
 Test.SkipUnless(
 Condition.HasCurlFeature('http2')
 )
diff --git a/tests/gold_tests/h2/h2enable_no_accept_threads.test.py 
b/tests/gold_tests/h2/h2enable_no_accept_threads.test.py
index 85be0ec..ec8f82b 100644
--- a/tests/gold_tests/h2/h2enable_no_accept_threads.test.py
+++ b/tests/gold_tests/h2/h2enable_no_accept_threads.test.py
@@ -20,7 +20,6 @@ Test.Summary = '''
 Test enabling H2 on

[trafficserver] branch master updated: Fixes some tls autests on macOS

2020-03-24 Thread bcall 
This is an automated email from the ASF dual-hosted git repository.

bcall 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 290fe4b  Fixes some tls autests on macOS
290fe4b is described below

commit 290fe4bff10b04eb9d3cdeabd13ee9789e84a6d6
Author: Randall Meyer 
AuthorDate: Mon Mar 23 12:51:05 2020 -0700

Fixes some tls autests on macOS

on macOS, wc precedes output with spaces
---
 tests/gold_tests/tls/tls_client_cert.test.py | 2 +-
 tests/gold_tests/tls/tls_tunnel.test.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/gold_tests/tls/tls_client_cert.test.py 
b/tests/gold_tests/tls/tls_client_cert.test.py
index 6732c45..89a1f9b 100644
--- a/tests/gold_tests/tls/tls_client_cert.test.py
+++ b/tests/gold_tests/tls/tls_client_cert.test.py
@@ -175,7 +175,7 @@ tr2.Processes.Default.ReturnCode = 0
 # At that point the new sni settings are ready to go
 def sni_reload_done(tsenv):
   def done_reload(process, hasRunFor, **kw):
-cmd = "grep 'sni.yaml finished loading' {0} | wc -l > 
{1}/test.out".format(ts.Disk.diags_log.Name, Test.RunDirectory)
+cmd = "grep 'sni.yaml finished loading' {0} | wc -l  | sed -e 's/ //g'> 
{1}/test.out".format(ts.Disk.diags_log.Name, Test.RunDirectory)
 retval = subprocess.run(cmd, shell=True, env=tsenv)
 if retval.returncode == 0:
   cmd ="if [ -f {0}/test.out -a \"`cat {0}/test.out`\" = \"2\" ] ; then 
true; else false; fi".format(Test.RunDirectory)
diff --git a/tests/gold_tests/tls/tls_tunnel.test.py 
b/tests/gold_tests/tls/tls_tunnel.test.py
index 0a7196f..3811a9b 100644
--- a/tests/gold_tests/tls/tls_tunnel.test.py
+++ b/tests/gold_tests/tls/tls_tunnel.test.py
@@ -152,7 +152,7 @@ trreload.Processes.Default.ReturnCode = 0
 # At that point the new sni settings are ready to go
 def sni_reload_done(tsenv):
   def done_reload(process, hasRunFor, **kw):
-cmd = "grep 'sni.yaml finished loading' {0} | wc -l > 
{1}/test.out".format(ts.Disk.diags_log.Name, Test.RunDirectory)
+cmd = "grep 'sni.yaml finished loading' {0} | wc -l | sed -e 's/ //g' > 
{1}/test.out".format(ts.Disk.diags_log.Name, Test.RunDirectory)
 retval = subprocess.run(cmd, shell=True, env=tsenv)
 if retval.returncode == 0:
   cmd ="if [ -f {0}/test.out -a \"`cat {0}/test.out`\" = \"2\" ] ; then 
true; else false; fi".format(Test.RunDirectory)