[trafficserver] branch master updated (4f25f3d -> 8274143)
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 4f25f3d Fix port selection for ssl ipv6 add 8274143 Turn on debug for the bash script test_logstats_summary No new revisions were added by this update. Summary of changes: src/traffic_logstats/tests/test_logstats_summary | 1 + 1 file changed, 1 insertion(+)
[trafficserver] annotated tag 7.1.9-rc2 updated (61e631a -> 96c3e02)
This is an automated email from the ASF dual-hosted git repository. bcall pushed a change to annotated tag 7.1.9-rc2 in repository https://gitbox.apache.org/repos/asf/trafficserver.git. *** WARNING: tag 7.1.9-rc2 was modified! *** from 61e631a (commit) to 96c3e02 (tag) tagging 61e631ac4e12ad283fc796b01ec56fb5442d3e62 (commit) replaces 7.1.9-rc1 by Bryan Call on Wed Feb 26 13:42:25 2020 -0800 - Log - Release Candidate 7.1.9-rc2 -BEGIN PGP SIGNATURE- iQIcBAABAgAGBQJeVuZBAAoJEE0VQRC4RQjsV68QAJFtjfKd3d01g2Wkq79pJWCX xUDuS5ET8zLGqyTjIJGpzjrp/CCdne0WEpgasi2YNTPDubK2wy9DDosYK7f9Of7q BSKr0tUTO1yH49e194ktUjCEmuQSs2RNe6u0+q15/Htc88MgB8zGsi1qxsxJ7wOD FpbtyuRu8oR0dDRdnL58J23qSVz4EhhfhZ3SmL1hQc2rItGOOvNTnnLPUExCUVyJ ubQiAEgWkzaPMJUBT6hbnkJc5ywaJYyK5c+t9fsf1RKp2zFmR0O3lXC41PTqUHAP HqpN52fF0s4ua9rk86XiPu8Vkw99OsRZtkbQqpuOfD/Bhh/eTx0Ulib16XkScGVj ivcWmD4JP3zdRO1CuoAr916myVRRoSZ8P3w2iFmNeWn+Ri41Zy8VoV83iBi2i4ZS 9bjJnCndPwUXkXJN6YIccj+90YyBREQeoqA/BIo5kuXLgzoabPKMk49r07Slyrj6 r4C1O2pLUuE6KJx9KrL/VoL1j/wrS1JOzPHGWCsbZmPLUorUFp0XBALDoV5o1MNq iu48tLsBa3sfW1nThndTXRxI+E3GCx+LBg1IglSuQVbUM/jrwD61TMZklfr2+ucM oQDqolRx3W8XFMs8cPBvKj4fzgH/9wTsa8+kBBkV/4tmuLcswvgtL3AAtw64eSX0 YKXI89231r7v4rAxl+tt =vzx9 -END PGP SIGNATURE- --- No new revisions were added by this update. Summary of changes:
[trafficserver] branch 7.1.x updated: Updated Changelog
This is an automated email from the ASF dual-hosted git repository. bcall pushed a commit to branch 7.1.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/7.1.x by this push: new 61e631a Updated Changelog 61e631a is described below commit 61e631ac4e12ad283fc796b01ec56fb5442d3e62 Author: Bryan Call AuthorDate: Wed Feb 26 13:40:37 2020 -0800 Updated Changelog --- CHANGELOG-7.1.9 | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG-7.1.9 b/CHANGELOG-7.1.9 index 0195f9f..33c0410 100644 --- a/CHANGELOG-7.1.9 +++ b/CHANGELOG-7.1.9 @@ -3,3 +3,4 @@ Changes with Apache Traffic Server 7.1.9 #6395 - Fixed how we handle unknown schemes #6399 - Fix chunked processing #6418 - Handle final delayed chunk size + #6456 - Fix to handle 304 response without timeout
[trafficserver] branch 7.1.x updated: Fix to handle 304 response without timeout
This is an automated email from the ASF dual-hosted git repository.
bcall pushed a commit to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/7.1.x by this push:
new 4c1006a Fix to handle 304 response without timeout
4c1006a is described below
commit 4c1006a59c14501d25777b69a72d015b44e3ce1a
Author: Susan Hinrichs
AuthorDate: Wed Feb 26 16:05:20 2020 +
Fix to handle 304 response without timeout
---
proxy/http2/Http2Stream.cc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/proxy/http2/Http2Stream.cc b/proxy/http2/Http2Stream.cc
index aa86876..5bf21b1 100644
--- a/proxy/http2/Http2Stream.cc
+++ b/proxy/http2/Http2Stream.cc
@@ -578,6 +578,7 @@ Http2Stream::update_write_request(IOBufferReader
*buf_reader, int64_t write_len,
return;
}
+ int send_event = (write_vio.ntodo() == bytes_avail || is_done) ?
VC_EVENT_WRITE_COMPLETE : VC_EVENT_WRITE_READY;
// Process the new data
if (!this->response_header_done) {
// Still parsing the response_header
@@ -602,7 +603,7 @@ Http2Stream::update_write_request(IOBufferReader
*buf_reader, int64_t write_len,
// If there is additional data, send it along in a data frame. Or if
this was header only
// make sure to send the end of stream
- if (this->response_is_data_available()) {
+ if (this->response_is_data_available() || send_event ==
VC_EVENT_WRITE_COMPLETE) {
this->send_response_body(call_update);
}
break;
[trafficserver] branch 9.0.x updated: Updating the autest version pin to 1.7.4.
This is an automated email from the ASF dual-hosted git repository. dragon 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 6ba9f18 Updating the autest version pin to 1.7.4. 6ba9f18 is described below commit 6ba9f1895347afc4407db67829fd3a91f9fcff1f Author: bneradt AuthorDate: Wed Oct 30 19:20:57 2019 + Updating the autest version pin to 1.7.4. (cherry picked from commit 60e6ace5c4c6908a0081bcbb2d5af197ab8a30c0) --- tests/Pipfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Pipfile b/tests/Pipfile index 8176a39..b9a79bb 100644 --- a/tests/Pipfile +++ b/tests/Pipfile @@ -24,7 +24,7 @@ autopep8 = "*" pyflakes = "*" [packages] -autest = "==1.7.3" +autest = "==1.7.4" traffic-replay = "*" # this should install TRLib, MicroServer, MicroDNS, Traffic-Replay hyper = "*" dnslib = "*"
[trafficserver] branch master updated (63018c1 -> 4f25f3d)
This is an automated email from the ASF dual-hosted git repository. dragon pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git. from 63018c1 SSLNetVConnection, fixed/removed assert when running debug build add 4f25f3d Fix port selection for ssl ipv6 No new revisions were added by this update. Summary of changes: tests/gold_tests/autest-site/trafficserver.test.ext | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
[trafficserver] branch 9.0.x updated: Fix rare SSN/TXN Start/Close Hook misorderings (#6364)
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 0163d73 Fix rare SSN/TXN Start/Close Hook misorderings (#6364)
0163d73 is described below
commit 0163d73284b7cd2a7f96220fd757be84073a9392
Author: Susan Hinrichs
AuthorDate: Thu Jan 30 15:58:15 2020 -0600
Fix rare SSN/TXN Start/Close Hook misorderings (#6364)
* Fix rare SSN/TXN Start/Close Hook misorderings
* Fix h2spec test failure
Co-authored-by: a-a-ron
(cherry picked from commit 37cc7b82af19382cd56d4ad3e7ba393fc9f7bff0)
---
proxy/ProxySession.cc | 7 +--
proxy/ProxySession.h | 2 +-
proxy/http/Http1ClientSession.cc | 6 +--
proxy/http/HttpSM.cc | 32 +---
proxy/http/HttpSM.h| 4 +-
proxy/http2/Http2ClientSession.cc | 12 +
proxy/http2/Http2ConnectionState.cc| 22 +++-
proxy/http2/Http2ConnectionState.h | 8 ++-
proxy/http2/Http2Stream.cc | 6 +--
tests/gold_tests/continuations/openclose.test.py | 10 ++--
.../gold_tests/continuations/openclose_h2.test.py | 16 +++---
tests/gold_tests/pluginTest/test_hooks/log.gold| 19 +++
.../pluginTest/test_hooks/test_hooks.test.py | 6 +++
tests/tools/plugins/ssntxnorder_verify.cc | 58 +++---
14 files changed, 130 insertions(+), 78 deletions(-)
diff --git a/proxy/ProxySession.cc b/proxy/ProxySession.cc
index 0298866..e64e7b9 100644
--- a/proxy/ProxySession.cc
+++ b/proxy/ProxySession.cc
@@ -110,7 +110,7 @@ ProxySession::state_api_callout(int event, void *data)
if (!schedule_event) { // Don't bother if there is already one
schedule_event = mutex->thread_holding->schedule_in(this,
HRTIME_MSECONDS(10));
}
-return 0;
+return -1;
}
cur_hook = nullptr; // mark current callback at dispatched.
@@ -134,7 +134,7 @@ ProxySession::state_api_callout(int event, void *data)
return 0;
}
-void
+int
ProxySession::do_api_callout(TSHttpHookID id)
{
ink_assert(id == TS_HTTP_SSN_START_HOOK || id == TS_HTTP_SSN_CLOSE_HOOK);
@@ -143,10 +143,11 @@ ProxySession::do_api_callout(TSHttpHookID id)
cur_hook = hook_state.getNext();
if (nullptr != cur_hook) {
SET_HANDLER(::state_api_callout);
-this->state_api_callout(EVENT_NONE, nullptr);
+return this->state_api_callout(EVENT_NONE, nullptr);
} else {
this->handle_api_return(TS_EVENT_HTTP_CONTINUE);
}
+ return 0;
}
void
diff --git a/proxy/ProxySession.h b/proxy/ProxySession.h
index e70b683..464356c 100644
--- a/proxy/ProxySession.h
+++ b/proxy/ProxySession.h
@@ -124,7 +124,7 @@ public:
virtual const char *protocol_contains(std::string_view tag_prefix) const;
// Non-Virtual Methods
- void do_api_callout(TSHttpHookID id);
+ int do_api_callout(TSHttpHookID id);
// Non-Virtual Accessors
void *get_user_arg(unsigned ix) const;
diff --git a/proxy/http/Http1ClientSession.cc b/proxy/http/Http1ClientSession.cc
index e7e8809..1e5601d 100644
--- a/proxy/http/Http1ClientSession.cc
+++ b/proxy/http/Http1ClientSession.cc
@@ -74,7 +74,6 @@ Http1ClientSession::destroy()
in_destroy = true;
HttpSsnDebug("[%" PRId64 "] session destroy", con_id);
-ink_release_assert(!client_vc);
ink_assert(read_buffer);
ink_release_assert(transact_count == released_transactions);
do_api_callout(TS_HTTP_SSN_CLOSE_HOOK);
@@ -287,10 +286,7 @@ Http1ClientSession::do_io_close(int alerrno)
HTTP_SUM_DYN_STAT(http_transactions_per_client_con, transact_count);
HTTP_DECREMENT_DYN_STAT(http_current_client_connections_stat);
conn_decrease = false;
-if (client_vc) {
- client_vc->do_io_close();
- client_vc = nullptr;
-}
+// the netvc will be closed in the session free
}
if (transact_count == released_transactions) {
this->destroy();
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index c4e850b..af18ab8 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -344,13 +344,14 @@ HttpSM::set_ua_half_close_flag()
ua_txn->set_half_close_flag(true);
}
-inline void
+inline int
HttpSM::do_api_callout()
{
if (hooks_set) {
-do_api_callout_internal();
+return do_api_callout_internal();
} else {
handle_api_return();
+return 0;
}
}
@@ -376,7 +377,16 @@ HttpSM::state_add_to_list(int event, void * /* data
ATS_UNUSED */)
}
t_state.api_next_action = HttpTransact::SM_ACTION_API_SM_START;
- do_api_callout();
+ if (do_api_callout() < 0) {
+// Didn't get the hook continuation lock. Clear the read and wait for next
event
+if (ua_entry->read_vio) {
+ // Seems like
[trafficserver] branch 9.0.x updated: SSLNetVConnection, fixed/removed assert when running debug build
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 efa5f15 SSLNetVConnection, fixed/removed assert when running debug
build
efa5f15 is described below
commit efa5f15622a86d7b7dd7b51f463a6a8e5006f00d
Author: Bryan Call
AuthorDate: Wed Feb 19 11:32:22 2020 -0800
SSLNetVConnection, fixed/removed assert when running debug build
(cherry picked from commit 63018c112da9aff591c0f5296588c72e42b547d0)
---
iocore/net/SSLNetVConnection.cc | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/iocore/net/SSLNetVConnection.cc b/iocore/net/SSLNetVConnection.cc
index 02618d4..b3e842a 100644
--- a/iocore/net/SSLNetVConnection.cc
+++ b/iocore/net/SSLNetVConnection.cc
@@ -478,7 +478,7 @@ bool
SSLNetVConnection::update_rbio(bool move_to_socket)
{
bool retval = false;
- if (BIO_eof(SSL_get_rbio(this->ssl))) {
+ if (BIO_eof(SSL_get_rbio(this->ssl)) && this->handShakeReader != nullptr) {
this->handShakeReader->consume(this->handShakeBioStored);
this->handShakeBioStored = 0;
// Load up the next block if present
@@ -601,7 +601,6 @@ SSLNetVConnection::net_read_io(NetHandler *nh, EThread
*lthread)
this->read.triggered = 0;
readSignalError(nh, err);
} else if (ret == SSL_HANDSHAKE_WANT_READ || ret ==
SSL_HANDSHAKE_WANT_ACCEPT) {
- ink_assert(this->handShakeReader != nullptr);
if (SSLConfigParams::ssl_handshake_timeout_in > 0) {
double handshake_time = (static_cast(Thread::get_hrtime() -
sslHandshakeBeginTime) / 10);
Debug("ssl", "ssl handshake for vc %p, took %.3f seconds, configured
handshake_timer: %d", this, handshake_time,
@@ -615,7 +614,7 @@ SSLNetVConnection::net_read_io(NetHandler *nh, EThread
*lthread)
}
}
// move over to the socket if we haven't already
- if (this->handShakeBuffer) {
+ if (this->handShakeBuffer != nullptr) {
read.triggered = update_rbio(true);
} else {
read.triggered = 0;
[trafficserver] branch master updated (17c48bf -> 63018c1)
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 17c48bf traffic_dump post_process.py add 63018c1 SSLNetVConnection, fixed/removed assert when running debug build No new revisions were added by this update. Summary of changes: iocore/net/SSLNetVConnection.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
[trafficserver] branch master updated (e2a3e29 -> 17c48bf)
This is an automated email from the ASF dual-hosted git repository. shinrich pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git. from e2a3e29 SSL: Introduce proxy.config.ssl.server.prioritize_chacha add 17c48bf traffic_dump post_process.py No new revisions were added by this update. Summary of changes: plugins/experimental/traffic_dump/post_process.py | 392 ++ 1 file changed, 392 insertions(+) create mode 100755 plugins/experimental/traffic_dump/post_process.py
[trafficserver] branch quic-latest updated (e4ac336 -> 68be51a)
This is an automated email from the ASF dual-hosted git repository.
maskit pushed a change to branch quic-latest
in repository https://gitbox.apache.org/repos/asf/trafficserver.git.
from e4ac336 traffic_quic: Add an option to specify a server name for SNI
add b3aa922 Update unit tests
add 2de1c35 URI Sig Null Check for Clang Warning (#6419)
add c154d40 Syntax Error fixed in URI sig Plugin (#6420)
add 7e138b3 Doc: Add link from proxy.config.proxy_binary_opts to
traffic_server options. Document the traffic_server -m, -M options, sort the
options a bit better.
add c0d29f3 Cleanup RamCacheCLFUS
add a96d0b2 Set default encoding UTF-8 for AuTest on Linux
add 6babe49 Replace python with python3 in AuTest
add a71a815 Export headers for internal YAML-CPP library. This allows
plugins to use the library in the same way and version as the TS core.
add aa903d9 Fixed encoding test to work with OpenSSL 1.0.2
add 0f1f028 Reset captive_action.cancelled during open read retry to
prevent assert
add a558db5 Disable the chunked_encoding test
add 87e7906 Another option to fix potential HTTP/2 vio stall
add 4f84c27 Cleaned up ssl-port
add ac5b1a5 Cleaned up smuggle-client
add a10526d Move log line length configuration to records.config docs.
add 2df57f9 Avoid a weird name collision between HRW and tscore (#6446)
add 19a8ac9 Revert "Disable the chunked_encoding test"
add 36e1dc4 Remove documentation for removed TSIOBufferReader API
functions.
add bacb820 Traffic Dump: fix client request target parsing
add e2a3e29 SSL: Introduce proxy.config.ssl.server.prioritize_chacha
add 68be51a Merge branch 'master' into quic-latest
No new revisions were added by this update.
Summary of changes:
ci/jenkins/bin/autest.sh | 11 +
doc/admin-guide/files/records.config.en.rst| 46 +++-
doc/admin-guide/logging/formatting.en.rst | 35 +--
doc/appendices/command-line/traffic_server.en.rst | 80 +++---
.../api/functions/TSIOBufferReader.en.rst | 32 ---
iocore/cache/P_RamCache.h | 4 +-
iocore/cache/RamCacheCLFUS.cc | 294 +++--
iocore/net/SSLConfig.cc| 7 +
iocore/net/quic/Mock.h | 5 +
iocore/net/quic/test/test_QUICPacketFactory.cc | 2 +-
lib/Makefile.am| 3 +
lib/yamlcpp/Makefile.am| 17 +-
mgmt/RecordsConfig.cc | 2 +
plugins/experimental/traffic_dump/traffic_dump.cc | 81 --
plugins/experimental/uri_signing/normalize.c | 2 +-
plugins/header_rewrite/header_rewrite_test.cc | 4 +-
plugins/header_rewrite/parser.cc | 2 +-
plugins/header_rewrite/parser.h| 8 +-
plugins/header_rewrite/value.cc| 2 +-
proxy/http/HttpCacheSM.cc | 2 +
proxy/http2/Http2Stream.cc | 69 +++--
proxy/http2/Http2Stream.h | 4 +-
tests/gold_tests/basic/deny0.test.py | 2 +-
.../body_factory/http204_response.test.py | 4 +-
.../body_factory/http204_response_plugin.test.py | 2 +-
.../body_factory/http304_response.test.py | 2 +-
.../body_factory/http_head_no_origin.test.py | 2 +-
.../body_factory/http_with_origin.test.py | 6 +-
tests/gold_tests/chunked_encoding/smuggle-client.c | 24 +-
tests/gold_tests/h2/httpbin.test.py| 2 +-
.../headers/domain-blacklist-30x.test.py | 12 +-
.../headers/general-connection-failure-502.test.py | 2 +-
tests/gold_tests/headers/http408.test.py | 2 +-
tests/gold_tests/logging/all_headers.test.py | 2 +-
tests/gold_tests/logging/new_log_flds.test.py | 2 +-
.../pluginTest/combo_handler/combo_handler.test.py | 2 +-
.../gold/{200.gold => explicit_target.gold}| 6 +-
.../pluginTest/traffic_dump/traffic_dump.test.py | 51 +++-
.../pluginTest/traffic_dump/verify_replay.py | 18 ++
.../pluginTest/xdebug/x_remap/x_remap.test.py | 2 +-
tests/gold_tests/redirect/redirect.test.py | 8 +-
tests/gold_tests/redirect/redirect_actions.test.py | 2 +-
tests/gold_tests/tls/ssl-post.c| 12 +-
43 files changed, 514 insertions(+), 363 deletions(-)
copy tests/gold_tests/pluginTest/traffic_dump/gold/{200.gold =>
explicit_target.gold} (53%)
