You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by so...@apache.org on 2015/04/04 17:08:21 UTC
[1/3] trafficserver git commit: TS-3482: fill the first SETTINGS
frame correctly
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 <m4...@gmail.com>
Authored: Fri Apr 3 22:45:57 2015 -0600
Committer: Phil Sorber <so...@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));
[3/3] trafficserver git commit: TS-3482 Well,
I just failed ... Forgot clang-format
Posted by so...@apache.org.
TS-3482 Well, I just failed ... Forgot clang-format
(cherry picked from commit edf29f3e2aee74ca419f5d95b078eaeffabd619a)
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/ee2c9524
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/ee2c9524
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/ee2c9524
Branch: refs/heads/5.3.x
Commit: ee2c952465bb5a7a7e9e09bd095e6c36a7fa78b0
Parents: 2b404e5
Author: Leif Hedstrom <zw...@apache.org>
Authored: Sat Apr 4 08:54:45 2015 -0600
Committer: Phil Sorber <so...@apache.org>
Committed: Sat Apr 4 09:02:28 2015 -0600
----------------------------------------------------------------------
proxy/http2/Http2ConnectionState.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ee2c9524/proxy/http2/Http2ConnectionState.cc
----------------------------------------------------------------------
diff --git a/proxy/http2/Http2ConnectionState.cc b/proxy/http2/Http2ConnectionState.cc
index 9f74df7..9f90858 100644
--- a/proxy/http2/Http2ConnectionState.cc
+++ b/proxy/http2/Http2ConnectionState.cc
@@ -609,8 +609,8 @@ Http2ConnectionState::main_event_handler(int event, void *edata)
param.id = id;
param.value = server_settings.get(id);
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;
+ 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));
[2/3] trafficserver git commit: Add TS-3482 to CHANGES.
Posted by so...@apache.org.
Add TS-3482 to CHANGES.
(cherry picked from commit 8fb1702e594071dfacaadea7ddae1663fc61123f)
Conflicts:
CHANGES
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/2b404e56
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/2b404e56
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/2b404e56
Branch: refs/heads/5.3.x
Commit: 2b404e56f3afd28495b85762e9ddc6af9979d454
Parents: 995fcea
Author: Leif Hedstrom <zw...@apache.org>
Authored: Fri Apr 3 22:50:34 2015 -0600
Committer: Phil Sorber <so...@apache.org>
Committed: Sat Apr 4 09:02:21 2015 -0600
----------------------------------------------------------------------
CHANGES | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2b404e56/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index e2a4aea..84c5670 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 5.3.0
+ *) [TS-3482] Fill the first SETTINGS frame correctly.
+ Author: Masakazu Kitajo <m4...@gmail.com>
+
*) [TS-3479] Remove verbose Warning() from HTTP/2 connections.
*) [TS-3470] traffic_server --help segfaults when SPDY is enabled.