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/07/29 01:40:32 UTC
[54/62] [abbrv] trafficserver git commit: Revert "TS-3584: SPDY and
H2 requests should not trigger connection keep-alive."
Revert "TS-3584: SPDY and H2 requests should not trigger connection keep-alive."
This reverts commit dda6814f07ee59c9e3e452a649e6e7f80906457d.
Conflicts:
CHANGES
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/0b160a7f
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/0b160a7f
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/0b160a7f
Branch: refs/heads/6.0.x
Commit: 0b160a7f3e438101a0be3937ad3e92ff186b614e
Parents: 5c60883
Author: shinrich <sh...@yahoo-inc.com>
Authored: Fri Jul 24 09:51:46 2015 -0500
Committer: shinrich <sh...@yahoo-inc.com>
Committed: Fri Jul 24 09:51:46 2015 -0500
----------------------------------------------------------------------
proxy/http2/HTTP2.cc | 2 --
proxy/spdy/SpdyCallbacks.cc | 3 ---
proxy/spdy/SpdyClientSession.h | 2 +-
3 files changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0b160a7f/proxy/http2/HTTP2.cc
----------------------------------------------------------------------
diff --git a/proxy/http2/HTTP2.cc b/proxy/http2/HTTP2.cc
index 6681308..f089081 100644
--- a/proxy/http2/HTTP2.cc
+++ b/proxy/http2/HTTP2.cc
@@ -544,8 +544,6 @@ convert_from_2_to_1_1_header(HTTPHdr *headers)
headers->field_delete(MIME_FIELD_TRANSFER_ENCODING, MIME_LEN_TRANSFER_ENCODING);
headers->field_delete(MIME_FIELD_UPGRADE, MIME_LEN_UPGRADE);
- headers->value_set(MIME_FIELD_CONNECTION, MIME_LEN_CONNECTION, HTTP_VALUE_CLOSE, HTTP_LEN_CLOSE);
-
return PARSE_DONE;
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0b160a7f/proxy/spdy/SpdyCallbacks.cc
----------------------------------------------------------------------
diff --git a/proxy/spdy/SpdyCallbacks.cc b/proxy/spdy/SpdyCallbacks.cc
index 45213a3..69b40c8 100644
--- a/proxy/spdy/SpdyCallbacks.cc
+++ b/proxy/spdy/SpdyCallbacks.cc
@@ -297,8 +297,6 @@ spdy_process_syn_stream_frame(SpdyClientSession *sm, SpdyRequest *req)
spdy_fetcher_launch(req);
}
-static char const *const no_keep_alive[] = {"Connection", "close", NULL};
-
void
spdy_on_ctrl_recv_callback(spdylay_session *session, spdylay_frame_type type, spdylay_frame *frame, void *user_data)
{
@@ -314,7 +312,6 @@ spdy_on_ctrl_recv_callback(spdylay_session *session, spdylay_frame_type type, sp
req = spdyRequestAllocator.alloc();
req->init(sm, stream_id);
req->append_nv(frame->syn_stream.nv);
- req->append_nv(no_keep_alive);
sm->req_map[stream_id] = req;
sm->vc->add_to_active_queue();
spdy_process_syn_stream_frame(sm, req);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0b160a7f/proxy/spdy/SpdyClientSession.h
----------------------------------------------------------------------
diff --git a/proxy/spdy/SpdyClientSession.h b/proxy/spdy/SpdyClientSession.h
index 498f6d8..12a5c79 100644
--- a/proxy/spdy/SpdyClientSession.h
+++ b/proxy/spdy/SpdyClientSession.h
@@ -56,7 +56,7 @@ public:
void clear();
void
- append_nv(const char *const *nv)
+ append_nv(char **nv)
{
for (int i = 0; nv[i]; i += 2) {
headers.push_back(make_pair(nv[i], nv[i + 1]));