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 2015/04/04 06:46:35 UTC
trafficserver git commit: TS-3482: fill the first SETTINGS frame
correctly
Repository: trafficserver
Updated Branches:
refs/heads/master e407f9d44 -> 5b5d0b10e
TS-3482: fill the first SETTINGS frame correctly
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/5b5d0b10
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/5b5d0b10
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/5b5d0b10
Branch: refs/heads/master
Commit: 5b5d0b10e08027231e5d96b2e53d11ee72a64595
Parents: e407f9d
Author: Masakazu Kitajo <m4...@gmail.com>
Authored: Fri Apr 3 22:45:57 2015 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Fri Apr 3 22:45:57 2015 -0600
----------------------------------------------------------------------
proxy/http2/Http2ConnectionState.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5b5d0b10/proxy/http2/Http2ConnectionState.cc
----------------------------------------------------------------------
diff --git a/proxy/http2/Http2ConnectionState.cc b/proxy/http2/Http2ConnectionState.cc
index 574c4ce..9f74df7 100644
--- a/proxy/http2/Http2ConnectionState.cc
+++ b/proxy/http2/Http2ConnectionState.cc
@@ -608,9 +608,9 @@ Http2ConnectionState::main_event_handler(int event, void *edata)
Http2SettingsParameter param;
param.id = id;
param.value = server_settings.get(id);
- iov.iov_base = reinterpret_cast<char *>(iov.iov_base) + HTTP2_SETTINGS_PARAMETER_LEN * (i - 1);
- iov.iov_len = HTTP2_SETTINGS_PARAMETER_LEN;
http2_write_settings(param, iov);
+ iov.iov_base = reinterpret_cast<uint8_t*>(iov.iov_base) + HTTP2_SETTINGS_PARAMETER_LEN;
+ iov.iov_len -= HTTP2_SETTINGS_PARAMETER_LEN;
}
settings.finalize(HTTP2_SETTINGS_PARAMETER_LEN * (HTTP2_SETTINGS_MAX - 1));