trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sor...@apache.org
Subject [1/3] trafficserver git commit: TS-3482: fill the first SETTINGS frame correctly
Date Sat, 04 Apr 2015 15:08:21 GMT
Repository: trafficserver
Updated Branches:
  refs/heads/5.3.x 42e8f7c45 -> ee2c95246


TS-3482: fill the first SETTINGS frame correctly

(cherry picked from commit 5b5d0b10e08027231e5d96b2e53d11ee72a64595)


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/995fcea2
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/995fcea2
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/995fcea2

Branch: refs/heads/5.3.x
Commit: 995fcea23bea72aca52ac324eea26b5d4d4ddd37
Parents: 42e8f7c
Author: Masakazu Kitajo <m4sk17@gmail.com>
Authored: Fri Apr 3 22:45:57 2015 -0600
Committer: Phil Sorber <sorber@apache.org>
Committed: Sat Apr 4 09:01:24 2015 -0600

----------------------------------------------------------------------
 proxy/http2/Http2ConnectionState.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/995fcea2/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));


Mime
View raw message