(trafficserver) branch master updated: Simplify bad-fmt test use of nc (#10861)
This is an automated email from the ASF dual-hosted git repository. shinrich 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 780b51c8c8 Simplify bad-fmt test use of nc (#10861) 780b51c8c8 is described below commit 780b51c8c84d5c4e5aa54170a8b4d38c74e4c727 Author: Susan Hinrichs AuthorDate: Thu Nov 30 16:43:04 2023 -0600 Simplify bad-fmt test use of nc (#10861) --- tests/gold_tests/bad_http_fmt/bad_http_fmt.test.py | 159 ++--- tests/gold_tests/bad_http_fmt/method-server.sh | 44 ++ tests/gold_tests/bad_http_fmt/server.gold | 18 +-- 3 files changed, 151 insertions(+), 70 deletions(-) diff --git a/tests/gold_tests/bad_http_fmt/bad_http_fmt.test.py b/tests/gold_tests/bad_http_fmt/bad_http_fmt.test.py index 8e84e18e1e..58959f5a0a 100644 --- a/tests/gold_tests/bad_http_fmt/bad_http_fmt.test.py +++ b/tests/gold_tests/bad_http_fmt/bad_http_fmt.test.py @@ -28,6 +28,52 @@ random_method = "xyzxyz" ts = Test.MakeATSProcess("ts") +Test.GetTcpPort("upstream_port") + +method_server = Test.Processes.Process("method-server", "bash -c '" + Test.TestDirectory + + f"/method-server.sh {Test.Variables.upstream_port} outserver'") + +server = Test.MakeOriginServer("server", ssl=False) +request_header = { +"headers": "GET {}/0 HTTP/1.1\r\nX-Req-Id: 0\r\nHost: example.com\r\n\r\n".format(random_path), +"timestamp": "1469733493.993", +"body": ""} +response_header = { +"headers": "HTTP/1.1 200 OK\r\nX-Resp-Id: 1\r\nConnection: close\r\n\r\n", +"timestamp": "1469733493.993", +"body": ""} +server.addResponse("sessionlog.json", request_header, response_header) + +request_header = { +"headers": "GET {}/1 HTTP/1.1\r\nX-Req-Id: 1\r\nHost: example.com\r\n\r\n".format(random_path), +"timestamp": "1469733493.993", +"body": ""} +response_header = { +"headers": "HTTP/1.1 200 OK\r\nX-Resp-Id: 2\r\nConnection: close\r\n\r\n", +"timestamp": "1469733493.993", +"body": ""} +server.addResponse("sessionlog.json", request_header, response_header) + +request_header = { +"headers": "GET /example/1 HTTP/1.1\r\nX-Req-Id: 6\r\nHost: example.com\r\n\r\n", +"timestamp": "1469733493.993", +"body": ""} +response_header = { +"headers": "HTTP/1.1 200 OK\r\nX-Resp-Id: 3\r\nConnection: close\r\n\r\n", +"timestamp": "1469733493.993", +"body": ""} +server.addResponse("sessionlog.json", request_header, response_header) + +request_header = { +"headers": "GET /example/2 HTTP/1.1\r\nX-Req-Id: 7\r\nHost: example.com\r\n\r\n", +"timestamp": "1469733493.993", +"body": ""} +response_header = { +"headers": "HTTP/1.1 200 OK\r\nX-Resp-Id: 4\r\nConnection: close\r\n\r\n", +"timestamp": "1469733493.993", +"body": ""} +server.addResponse("sessionlog.json", request_header, response_header) + ts.Disk.records_config.update({ 'proxy.config.diags.debug.enabled': 1, 'proxy.config.diags.debug.tags': 'http|dns', @@ -55,108 +101,111 @@ ts.Disk.ip_allow_yaml.AddLines([ ' - GET' ]) -Test.GetTcpPort("server_port") - - -def server_cmd(resp_id): -dq = '"' -return (fr"(nc -o server{resp_id}.log " + -fr"--sh-exec 'sleep 1 ; printf {dq}HTTP/1.1 200 OK\r\n" + -fr"X-Resp-Id: {resp_id}\r\n" + -fr"Content-Length: 0\r\n\r\n{dq}' " + -fr"-l 127.0.0.1 {Test.Variables.server_port} & )") - +ts.Disk.remap_config.AddLine( +'map /add-method http://127.0.0.1:{0}/'.format(Test.Variables.upstream_port) +) +ts.Disk.remap_config.AddLine( +'map / http://127.0.0.1:{0}/'.format(server.Variables.Port) +) # Even if the request from the client is HTTP version 1.0, ATS's request to server will be HTTP version 1.1. # -tr = Test.AddTestRun() +tr = Test.AddTestRun("success-1.0") tr.Processes.Default.StartBefore(ts) +tr.Processes.Default.StartBefore(server) tr.Processes.Default.Command = ( -server_cmd(1) + -fr" ; printf 'GET {random_path}HTTP/1.0\r\n" + -fr"Host: localhost:{Test.Variables.server_port}\r\n" + -r"X-Req-Id: 0\r\n\r\n'" + +f"printf 'GET {random_path}/0HTTP/1.0\r\n" + +"Host: example.com\r\n" + +"Connection: close\r\n" + +"X-Req-Id: 1\r\n\r\n'" + f" | nc localhost {ts.Variables.port} >> client.log" + " ; echo '==' >> client.log" ) tr.Processes.Default.ReturnCode = 0 -tr = Test.AddTestRun() +tr = Test.AddTestRun("success-1.1") tr.Processes.Default.Command = ( -server_cmd(2) + -fr" ; printf 'GET {random_path}HTTP/1.1\r\n" + -fr"Host: localhost:{Test.Variables.server_port}\r\n" + -r"X-Req-Id: 1\r\n\r\n'" + +f"printf 'GET {random_path}/1HTTP/1.1\r\n" + +"Host: example.com\r\n" + +"Connection: close\r\n" + +"X-Req-Id: 2\r\n\r\n'" + f" | nc localhost {ts.Variables.port} >> client.log" + " ; echo '==' >> client
(trafficserver) branch master updated: Fix double to watch for done like the other continuation tests (#10874)
This is an automated email from the ASF dual-hosted git repository. shinrich 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 cd2e49031c Fix double to watch for done like the other continuation tests (#10874) cd2e49031c is described below commit cd2e49031c7918a066fb31fb091dfafaf6fb818e Author: Susan Hinrichs AuthorDate: Thu Nov 30 13:10:31 2023 -0600 Fix double to watch for done like the other continuation tests (#10874) --- tests/gold_tests/continuations/double.test.py | 37 +-- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/tests/gold_tests/continuations/double.test.py b/tests/gold_tests/continuations/double.test.py index 52b11ca694..110c971984 100644 --- a/tests/gold_tests/continuations/double.test.py +++ b/tests/gold_tests/continuations/double.test.py @@ -81,24 +81,33 @@ tr.StillRunningAfter = ts # Signal that all the curl processes have completed and poll for done metric tr = Test.AddTestRun("Curl Done") -tr.Processes.Default.Command = ( -"traffic_ctl plugin msg done done ; " -"N=60 ; " -"while (( N > 0 )) ; " -"do " -"sleep 1 ; " -'if [[ "$$( traffic_ctl metric get continuations_verify.test.done )" = ' -'"continuations_verify.test.done 1" ]] ; then exit 0 ; ' -"fi ; " -"let N=N-1 ; " -"done ; " -"echo TIMEOUT ; " -"exit 1" -) +tr.Processes.Default.Command = "traffic_ctl plugin msg done done" tr.Processes.Default.ReturnCode = 0 tr.Processes.Default.Env = ts.Env tr.StillRunningAfter = ts + +def make_done_stat_ready(tsenv): +def done_stat_ready(process, hasRunFor, **kw): +retval = subprocess.run( +"traffic_ctl metric get continuations_verify.test.done", +shell=True, +stdout=subprocess.PIPE, +stderr=subprocess.STDOUT, +env=tsenv) +return retval.returncode == 0 and b'1' in retval.stdout + +return done_stat_ready + + +watcher = Test.Processes.Process("watcher", "sleep 20") + +tr = Test.AddTestRun("Wait for stats") +tr.Processes.Default.StartBefore(watcher, ready=make_done_stat_ready(ts.Env)) +tr.Processes.Default.Command = "traffic_ctl metric get continuations_verify.test.done" +tr.Processes.Default.ReturnCode = 0 +tr.Processes.Default.Env = ts.Env + # number of sessions/transactions opened and closed are equal tr = Test.AddTestRun("Check Ssn") tr.Processes.Default.Command = comparator_command.format('ssn')
(trafficserver) branch master updated: Remove netcat from bigobj test (#10866)
This is an automated email from the ASF dual-hosted git repository. shinrich 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 1ce86a82b6 Remove netcat from bigobj test (#10866) 1ce86a82b6 is described below commit 1ce86a82b63ce33756af68c8da1c3fb6d12fb2c6 Author: Susan Hinrichs AuthorDate: Thu Nov 30 10:38:29 2023 -0600 Remove netcat from bigobj test (#10866) --- tests/CMakeLists.txt | 1 - tests/gold_tests/bigobj/CMakeLists.txt | 19 -- tests/gold_tests/bigobj/bigobj.test.py | 112 +++-- tests/gold_tests/bigobj/check_ramp.c | 57 - tests/gold_tests/bigobj/log2.gold | 4 -- tests/gold_tests/bigobj/push_request.c | 79 --- 6 files changed, 66 insertions(+), 206 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index d58dcd3265..afd94746d3 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -27,7 +27,6 @@ function(ADD_AUTEST_PLUGIN _NAME) endfunction() add_subdirectory(tools/plugins) -add_subdirectory(gold_tests/bigobj) add_subdirectory(gold_tests/chunked_encoding) add_subdirectory(gold_tests/continuations/plugins) add_subdirectory(gold_tests/jsonrpc/plugins) diff --git a/tests/gold_tests/bigobj/CMakeLists.txt b/tests/gold_tests/bigobj/CMakeLists.txt deleted file mode 100644 index b56709f853..00 --- a/tests/gold_tests/bigobj/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -### -# -# 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. -# -### - -add_executable(check_ramp check_ramp.c) -add_executable(push_request push_request.c) diff --git a/tests/gold_tests/bigobj/bigobj.test.py b/tests/gold_tests/bigobj/bigobj.test.py index b46f417878..30b82541ee 100644 --- a/tests/gold_tests/bigobj/bigobj.test.py +++ b/tests/gold_tests/bigobj/bigobj.test.py @@ -28,11 +28,6 @@ Test.SkipUnless( Condition.HasCurlFeature('http2') ) -# push_request and check_ramp are built via `make`. Here we copy the built binary down to the test -# directory so that the test runs in this file can use it. -Test.Setup.Copy(os.path.join(Test.Variables.AtsBuildGoldTestsDir, 'bigobj', 'push_request')) -Test.Setup.Copy(os.path.join(Test.Variables.AtsBuildGoldTestsDir, 'bigobj', 'check_ramp')) - ts = Test.MakeATSProcess("ts1", enable_tls=True) ts.addDefaultSSLFiles() @@ -52,65 +47,88 @@ ts.Disk.ssl_multicert_config.AddLine( ) ts.Disk.remap_config.AddLine( -'map https://localhost http://localhost' +f'map https://localhost:{ts.Variables.ssl_port} http://localhost:{ts.Variables.port}' +) +ts.Disk.remap_config.AddLine( +f'map https://localhost:{ts.Variables.ssl_portv6} http://localhost:{ts.Variables.port}' ) - -# Set up to check the output after the tests have run. -# -log_id = Test.Disk.File("log2.txt") -log_id.Content = "log2.gold" # Size of object to get. (NOTE: If you increase this significantly you may also have to increase cache # capacity in tests/gold_tests/autest-size/min_cfg/storage.config. Also, for very large objects, if # proxy.config.diags.debug.enabled is 1, the PUSH request will timeout and fail.) # obj_kilobytes = 10 * 1024 +obj_bytes = obj_kilobytes * 10 +header = "HTTP/1.1 200 OK\r\nContent-length: {}\r\n\r\n".format(obj_bytes) + + +def create_pushfile(): +f = open(Test.RunDirectory + "/objfile", "w") +f.write(header) +f.write("x" * obj_bytes) +f.close() +return True + tr = Test.AddTestRun("PUSH an object to the cache") # Delay on readiness of TS IPv4 ssl port -tr.Processes.Default.StartBefore(ts) -# +tr.Processes.Default.StartBefore(ts, ready=lambda: create_pushfile()) # Put object with URL http://localhost/bigobj in cache using PUSH request. -tr.Processes.Default.Command = ( -f'./push_request {obj_kilobytes} | nc localhost {ts.Variables.port}' -) +tr.Processes.Default.Command = "curl -v -H 'Content-Type: application/octet-stream' --data-binary @{}/objfile -X PUSH http://localhost:{}/bigobj -H 'Content-Length:{}'".format( +Test.RunDirectory, ts.Variables.port, len(header) + obj_bytes) tr.Proc
(trafficserver) branch master updated: Coverity 1497378: Use of 32-bit time_t in CacheVC (#10857)
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 6b896f43be Coverity 1497378: Use of 32-bit time_t in CacheVC (#10857) 6b896f43be is described below commit 6b896f43bef38c42d574d8bc89293766e0dbc94f Author: Bryan Call AuthorDate: Thu Nov 30 08:26:22 2023 -0800 Coverity 1497378: Use of 32-bit time_t in CacheVC (#10857) And removed unneeded casting --- include/iocore/cache/CacheVC.h | 2 +- src/iocore/cache/CacheWrite.cc | 6 ++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/include/iocore/cache/CacheVC.h b/include/iocore/cache/CacheVC.h index 84a07609ae..35bc895f3e 100644 --- a/include/iocore/cache/CacheVC.h +++ b/include/iocore/cache/CacheVC.h @@ -270,7 +270,7 @@ struct CacheVC : public CacheVConnection { Event *trigger; CacheKey *read_key; ContinuationHandler save_handler; - uint32_t pin_in_cache; + time_t pin_in_cache; ink_hrtime start_time; int op_type; // Index into the metrics array for this operation, rather than a CacheOpType (fewer casts) int recursive; diff --git a/src/iocore/cache/CacheWrite.cc b/src/iocore/cache/CacheWrite.cc index 536070bdfd..069c0c690c 100644 --- a/src/iocore/cache/CacheWrite.cc +++ b/src/iocore/cache/CacheWrite.cc @@ -1591,8 +1591,7 @@ Cache::open_write(Continuation *cont, const CacheKey *key, CacheFragType frag_ty c->f.overwrite = (options & CACHE_WRITE_OPT_OVERWRITE) != 0; c->f.close_complete = (options & CACHE_WRITE_OPT_CLOSE_COMPLETE) != 0; c->f.sync = (options & CACHE_WRITE_OPT_SYNC) == CACHE_WRITE_OPT_SYNC; - // coverity[Y2K38_SAFETY:FALSE] - c->pin_in_cache = static_cast(apin_in_cache); + c->pin_in_cache = apin_in_cache; if ((res = c->stripe->open_write_lock(c, false, 1)) > 0) { // document currently being written, abort @@ -1693,8 +1692,7 @@ Cache::open_write(Continuation *cont, const CacheKey *key, CacheHTTPInfo *info, Metrics::Gauge::increment(cache_rsb.status[c->op_type].active); Metrics::Gauge::increment(stripe->cache_vol->vol_rsb.status[c->op_type].active); - // coverity[Y2K38_SAFETY:FALSE] - c->pin_in_cache = static_cast(apin_in_cache); + c->pin_in_cache = apin_in_cache; { CACHE_TRY_LOCK(lock, c->stripe->mutex, cont->mutex->thread_holding);
(trafficserver) branch master updated: Coverity 1528709: Pointer to local outside scope in PreWarmSM::state_dns_lookup (#10876)
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 6097d93f29 Coverity 1528709: Pointer to local outside scope in PreWarmSM::state_dns_lookup (#10876) 6097d93f29 is described below commit 6097d93f2976b729af7781e96526dd952923227f Author: Bryan Call AuthorDate: Thu Nov 30 08:24:51 2023 -0800 Coverity 1528709: Pointer to local outside scope in PreWarmSM::state_dns_lookup (#10876) --- src/proxy/http/PreWarmManager.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/proxy/http/PreWarmManager.cc b/src/proxy/http/PreWarmManager.cc index 82ce2411dc..527de32020 100644 --- a/src/proxy/http/PreWarmManager.cc +++ b/src/proxy/http/PreWarmManager.cc @@ -312,15 +312,14 @@ PreWarmSM::state_dns_lookup(int event, void *data) break; } case EVENT_SRV_LOOKUP: { -_pending_action = nullptr; +_pending_action = nullptr; +char srv_hostname[MAXDNAME] = {}; // Needs to have the same scope as hostname std::string_view hostname; if (record == nullptr || !record->is_srv()) { // no SRV record, fallback to default lookup hostname = _dst->host; } else { - char srv_hostname[MAXDNAME] = {0}; - hostname = std::string_view(srv_hostname); HostDBInfo *info =
(trafficserver) branch master updated: Coverity 1497446: Wrapper object use after free in GzipInflateTransformation (#10877)
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 8ab65ab151 Coverity 1497446: Wrapper object use after free in GzipInflateTransformation (#10877) 8ab65ab151 is described below commit 8ab65ab1514b9dee0ec776d1bb72f5970941f2c7 Author: Bryan Call AuthorDate: Thu Nov 30 08:24:08 2023 -0800 Coverity 1497446: Wrapper object use after free in GzipInflateTransformation (#10877) Ignore false positive --- src/tscpp/api/GzipInflateTransformation.cc | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/tscpp/api/GzipInflateTransformation.cc b/src/tscpp/api/GzipInflateTransformation.cc index 04c389205e..9b2077f80e 100644 --- a/src/tscpp/api/GzipInflateTransformation.cc +++ b/src/tscpp/api/GzipInflateTransformation.cc @@ -107,11 +107,13 @@ GzipInflateTransformation::consume(std::string_view data) while (state_->z_stream_.avail_in > 0 && err != Z_STREAM_END) { LOG_DEBUG("Iteration %d: Gzip has %d bytes to inflate", ++iteration, state_->z_stream_.avail_in); -// Setup where the decompressed output will go. +// Setup where the decompressed output will go +// next_out needs to be set to nullptr before we return since it points to a local buffer +// coverity[WRAPPER_ESCAPE: FALSE] state_->z_stream_.next_out = reinterpret_cast(&buffer[0]); state_->z_stream_.avail_out = inflate_block_size; -/* Uncompress */ +// Uncompress the data err = inflate(&state_->z_stream_, Z_SYNC_FLUSH); if (err != Z_OK && err != Z_STREAM_END) {
(trafficserver) branch master updated: Coverity 1523692: Calling risky function in test_AcidPtr (#10880)
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 aff23cd266 Coverity 1523692: Calling risky function in test_AcidPtr (#10880) aff23cd266 is described below commit aff23cd266fafc4af3e66ee22547b5f66af05c5e Author: Bryan Call AuthorDate: Thu Nov 30 08:23:33 2023 -0800 Coverity 1523692: Calling risky function in test_AcidPtr (#10880) Switching to use random() instead of rand() --- src/tscore/unit_tests/test_AcidPtr.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/tscore/unit_tests/test_AcidPtr.cc b/src/tscore/unit_tests/test_AcidPtr.cc index bca36f3ace..b9b29c97c7 100644 --- a/src/tscore/unit_tests/test_AcidPtr.cc +++ b/src/tscore/unit_tests/test_AcidPtr.cc @@ -28,6 +28,7 @@ #include #include #include +#include using namespace std; @@ -47,7 +48,7 @@ TEST_CASE("AcidPtr Atomicity") unique_lock gate_lock(gate_mutex); gate.wait(gate_lock); } -int r = rand(); +int r = random(); AcidCommitPtr> cptr(ptr); int old = (*cptr)[0]; for (int &i : *cptr) {
(trafficserver) branch master updated: Fix logging path for regex_revalidate_state (#10884)
This is an automated email from the ASF dual-hosted git repository. shinrich 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 95baa7e23d Fix logging path for regex_revalidate_state (#10884) 95baa7e23d is described below commit 95baa7e23dc714901dc067167be4f29258bf929f Author: Susan Hinrichs AuthorDate: Thu Nov 30 09:59:12 2023 -0600 Fix logging path for regex_revalidate_state (#10884) --- .../pluginTest/regex_revalidate/regex_revalidate_state.test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/gold_tests/pluginTest/regex_revalidate/regex_revalidate_state.test.py b/tests/gold_tests/pluginTest/regex_revalidate/regex_revalidate_state.test.py index 88cdf836f2..74fd575f8a 100644 --- a/tests/gold_tests/pluginTest/regex_revalidate/regex_revalidate_state.test.py +++ b/tests/gold_tests/pluginTest/regex_revalidate/regex_revalidate_state.test.py @@ -61,7 +61,7 @@ response_header_0 = {"headers": server.addResponse("sessionlog.json", request_header_0, response_header_0) reval_conf_path = os.path.join(ts.Variables.CONFIGDIR, 'reval.conf') -reval_state_path = os.path.join(Test.Variables.RUNTIMEDIR, 'reval.state') +reval_state_path = os.path.join(ts.Variables.RUNTIMEDIR, 'reval.state') # Configure ATS server ts.Disk.plugin_config.AddLine(
(trafficserver) branch master updated: Fix nc use in tls-forward-test (#10887)
This is an automated email from the ASF dual-hosted git repository. shinrich 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 8dce458105 Fix nc use in tls-forward-test (#10887) 8dce458105 is described below commit 8dce45810577179229b67f2c247226764236a418 Author: Susan Hinrichs AuthorDate: Thu Nov 30 09:58:34 2023 -0600 Fix nc use in tls-forward-test (#10887) --- tests/gold_tests/tls/test-nc-s_client.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/gold_tests/tls/test-nc-s_client.sh b/tests/gold_tests/tls/test-nc-s_client.sh index f08574e045..58ddaf743a 100644 --- a/tests/gold_tests/tls/test-nc-s_client.sh +++ b/tests/gold_tests/tls/test-nc-s_client.sh @@ -23,5 +23,5 @@ if openssl s_client --help 2>&1 | grep -q ignore_unexpected_eof then ignore_unexpected_eof='-ignore_unexpected_eof' fi -nc -l -p "$1" -c 'echo -e "This is a reply"' -o test.out & -echo "This is a test" | openssl s_client -servername bar.com -connect "localhost:$2" -ign_eof ${ignore_unexpected_eof} "${@:3}" +echo -e "This is a reply" | nc -l "$1" > test.out & +echo "This is a test" | openssl s_client -servername bar.com -connect "localhost:$2" -ign_eof ${ignore_unexpected_eof}