You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by su...@apache.org on 2014/12/28 19:07:59 UTC
[1/2] trafficserver git commit: [TS-3265]: Fix spdy req_map access to
use iterator instead of operator[]
Repository: trafficserver
Updated Branches:
refs/heads/master 0924e5d72 -> 964cc4630
[TS-3265]: Fix spdy req_map access to use iterator instead of operator[]
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/fc9f6707
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/fc9f6707
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/fc9f6707
Branch: refs/heads/master
Commit: fc9f67072a2ee949894f5d38abb30e1e556e9e26
Parents: 0924e5d
Author: Sudheer Vinukonda <su...@yahoo-inc.com>
Authored: Sun Dec 28 18:05:48 2014 +0000
Committer: Sudheer Vinukonda <su...@yahoo-inc.com>
Committed: Sun Dec 28 18:05:48 2014 +0000
----------------------------------------------------------------------
proxy/spdy/SpdyCallbacks.cc | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fc9f6707/proxy/spdy/SpdyCallbacks.cc
----------------------------------------------------------------------
diff --git a/proxy/spdy/SpdyCallbacks.cc b/proxy/spdy/SpdyCallbacks.cc
index 4d1aceb..7d7605d 100644
--- a/proxy/spdy/SpdyCallbacks.cc
+++ b/proxy/spdy/SpdyCallbacks.cc
@@ -52,7 +52,11 @@ spdy_callbacks_init(spdylay_session_callbacks *callbacks)
void
spdy_prepare_status_response_and_clean_request(SpdyClientSession *sm, int stream_id, const char *status)
{
- SpdyRequest *req = sm->req_map[stream_id];
+ SpdyRequest *req = sm->find_request(stream_id);
+ if (!req) {
+ Error ("spdy_prepare_status_response_and_clean_request, req object null for sm %" PRId64 ", stream_id %d", sm->sm_id, stream_id);
+ return;
+ }
string date_str = http_date(time(0));
const char **nv = new const char*[8+req->headers.size()*2+1];
@@ -328,7 +332,11 @@ spdy_on_ctrl_recv_callback(spdylay_session *session, spdylay_frame_type type,
case SPDYLAY_HEADERS:
stream_id = frame->syn_stream.stream_id;
- req = sm->req_map[stream_id];
+ req = sm->find_request(stream_id);
+ if (!req) {
+ Error ("spdy_on_ctrl_recv_callback, req object null on SPDYLAY_HEADERS for sm %" PRId64 ", stream_id %d", sm->sm_id, stream_id);
+ return;
+ }
req->append_nv(frame->headers.nv);
break;
[2/2] trafficserver git commit: update CHANGES
Posted by su...@apache.org.
update CHANGES
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/964cc463
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/964cc463
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/964cc463
Branch: refs/heads/master
Commit: 964cc4630a15d872f49a05c5dbf9fa5055c06a2e
Parents: fc9f670
Author: Sudheer Vinukonda <su...@yahoo-inc.com>
Authored: Sun Dec 28 18:07:47 2014 +0000
Committer: Sudheer Vinukonda <su...@yahoo-inc.com>
Committed: Sun Dec 28 18:07:47 2014 +0000
----------------------------------------------------------------------
CHANGES | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/964cc463/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 0d91347..2cb36c7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 5.3.0
+ *) [TS-3265] Fix spdy req_map access to use iterator instead of operator[]
+
*) [TS-3261] Fix SSL BIO memory leak issue introduced in TS-3006
*) [TS-3225] add more API support to ts_lua plugin.