You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by sh...@apache.org on 2015/07/24 16:55:14 UTC
[1/2] trafficserver git commit: Revert "TS-3640: Drupal auth fails
over SPDY"
Repository: trafficserver
Updated Branches:
refs/heads/master f40bd7ca3 -> 0b160a7f3
Revert "TS-3640: Drupal auth fails over SPDY"
This reverts commit c8bcd7006ffe66e4dd2d8f072da771cd947e4643.
Conflicts:
proxy/http/HttpSM.cc
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/5c60883e
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/5c60883e
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/5c60883e
Branch: refs/heads/master
Commit: 5c60883e8919383e61b0199a6289ddc40a3ddc5a
Parents: f40bd7c
Author: shinrich <sh...@yahoo-inc.com>
Authored: Fri Jul 24 09:50:52 2015 -0500
Committer: shinrich <sh...@yahoo-inc.com>
Committed: Fri Jul 24 09:50:52 2015 -0500
----------------------------------------------------------------------
proxy/http/HttpSM.cc | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5c60883e/proxy/http/HttpSM.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index 4ac8d4a..c9b1322 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -3173,9 +3173,19 @@ HttpSM::tunnel_handler_ua(int event, HttpTunnelConsumer *c)
ink_assert(ua_entry->vc == c->vc);
if (close_connection) {
- // If the client could be pipelining, we need to set the ua_session into half close mode
-
- if (t_state.client_info.pipeline_possible == true && c->producer->vc_type != HT_STATIC && event == VC_EVENT_WRITE_COMPLETE) {
+ // If the client could be pipelining or is doing a POST, we need to
+ // set the ua_session into half close mode
+
+ // only external POSTs should be subject to this logic; ruling out internal POSTs here
+ bool is_eligible_post_request = (t_state.method == HTTP_WKSIDX_POST);
+ if (is_eligible_post_request) {
+ NetVConnection *vc = ua_session->get_netvc();
+ if (vc) {
+ is_eligible_post_request = vc->get_is_internal_request() ? false : true;
+ }
+ }
+ if ((is_eligible_post_request || t_state.client_info.pipeline_possible == true) && c->producer->vc_type != HT_STATIC &&
+ event == VC_EVENT_WRITE_COMPLETE) {
ua_session->set_half_close_flag();
}
[2/2] trafficserver git commit: Revert "TS-3584: SPDY and H2 requests
should not trigger connection keep-alive."
Posted by sh...@apache.org.
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/master
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]));