You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2017/06/21 22:09:55 UTC
[trafficserver] branch 7.1.x updated (4f31f85 -> 6dac746)
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a change to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git.
from 4f31f85 Add a dependency that is gone from master for these checks
new 9a70787 TS-4396: fix number_of_redirections off-by-one
new 96f5886 Update H2 priority tree node with a created stream
new 6dac746 Fix handling read errors in TLS Handshake
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:
iocore/net/SSLNetVConnection.cc | 6 ++++--
proxy/http/HttpSM.cc | 4 ++--
proxy/http2/Http2ConnectionState.cc | 1 +
3 files changed, 7 insertions(+), 4 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].
[trafficserver] 02/03: Update H2 priority tree node with a created
stream
Posted by zw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 96f5886aa7f82c7b6b94daa0b15e81cd35ccd33c
Author: Masakazu Kitajo <ma...@apache.org>
AuthorDate: Wed Jun 21 11:35:34 2017 +0900
Update H2 priority tree node with a created stream
Priority tree node was not updated if the node was created with a PRIORITY frame.
This fixes h2spec:3.3.2 Sends a PRIORITY frame with priority 256
(cherry picked from commit 53b9b9235009ee6b7a9c70f89fc01d77e0dce78b)
---
proxy/http2/Http2ConnectionState.cc | 1 +
1 file changed, 1 insertion(+)
diff --git a/proxy/http2/Http2ConnectionState.cc b/proxy/http2/Http2ConnectionState.cc
index 7766d17..aad39cf 100644
--- a/proxy/http2/Http2ConnectionState.cc
+++ b/proxy/http2/Http2ConnectionState.cc
@@ -282,6 +282,7 @@ rcv_headers_frame(Http2ConnectionState &cstate, const Http2Frame &frame)
DependencyTree::Node *node = cstate.dependency_tree->find(stream_id);
if (node != nullptr) {
stream->priority_node = node;
+ node->t = stream;
} else {
DebugHttp2Stream(cstate.ua_session, stream_id, "PRIORITY - dep: %d, weight: %d, excl: %d, tree size: %d",
params.priority.stream_dependency, params.priority.weight, params.priority.exclusive_flag,
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.
[trafficserver] 01/03: TS-4396: fix number_of_redirections
off-by-one
Posted by zw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 9a7078753c4d904ba1638b3f64ee6371efa84023
Author: Zhao Yongming <mi...@gmail.com>
AuthorDate: Sat Jul 2 19:09:08 2016 +0800
TS-4396: fix number_of_redirections off-by-one
(cherry picked from commit 452a2dc6466eae58ac03a3d29868130815e599c0)
---
proxy/http/HttpSM.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index 2ab33d8..c8da407 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -1972,7 +1972,7 @@ HttpSM::state_read_server_response_header(int event, void *data)
t_state.api_next_action = HttpTransact::SM_ACTION_API_READ_RESPONSE_HDR;
// if exceeded limit deallocate postdata buffers and disable redirection
- if (enable_redirection && (redirection_tries < t_state.txn_conf->number_of_redirections)) {
+ if (enable_redirection && (redirection_tries <= t_state.txn_conf->number_of_redirections)) {
++redirection_tries;
} else {
tunnel.deallocate_redirect_postdata_buffers();
@@ -7758,7 +7758,7 @@ void
HttpSM::do_redirect()
{
DebugSM("http_redirect", "[HttpSM::do_redirect]");
- if (!enable_redirection || redirection_tries >= t_state.txn_conf->number_of_redirections) {
+ if (!enable_redirection || redirection_tries > t_state.txn_conf->number_of_redirections) {
tunnel.deallocate_redirect_postdata_buffers();
return;
}
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.
[trafficserver] 03/03: Fix handling read errors in TLS Handshake
Posted by zw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 6dac746d639838f67d05332ad37bf85e26453afb
Author: Masaori Koshiba <ma...@apache.org>
AuthorDate: Wed Jun 7 12:39:54 2017 +0900
Fix handling read errors in TLS Handshake
(cherry picked from commit b3c59095fa9cd1503ab552b72283b52c32dfb577)
---
iocore/net/SSLNetVConnection.cc | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/iocore/net/SSLNetVConnection.cc b/iocore/net/SSLNetVConnection.cc
index dc3a54c..35f4009 100644
--- a/iocore/net/SSLNetVConnection.cc
+++ b/iocore/net/SSLNetVConnection.cc
@@ -350,10 +350,12 @@ SSLNetVConnection::read_raw_data()
// If we have already moved some bytes successfully, adjust total_read to reflect reality
// If any read succeeded, we should return success
if (r != rattempted) {
- if (r <= 0)
+ // If the first read failds, we should return error
+ if (r <= 0 && total_read > rattempted) {
r = total_read - rattempted;
- else
+ } else {
r = total_read - rattempted + r;
+ }
}
NET_SUM_DYN_STAT(net_read_bytes_stat, r);
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.