You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2012/10/12 06:54:48 UTC
[1/2] git commit: TS-1513: SPDY plugin crashes on connection close
Updated Branches:
refs/heads/master 34a2bade2 -> dc36d49eb
TS-1513: SPDY plugin crashes on connection close
Fix TSVConn double-release on SPDY stream close.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/dc36d49e
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/dc36d49e
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/dc36d49e
Branch: refs/heads/master
Commit: dc36d49eb3e240b3d8fd8b89ab178a7b1ec17d8b
Parents: dba0879
Author: James Peach <jp...@apache.org>
Authored: Thu Oct 11 21:53:00 2012 -0700
Committer: James Peach <jp...@apache.org>
Committed: Thu Oct 11 21:53:58 2012 -0700
----------------------------------------------------------------------
CHANGES | 2 ++
plugins/experimental/spdy/stream.cc | 3 +--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/dc36d49e/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 8cc01cb..8bc9096 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 3.3.1
+ *) [TS-1513] SPDY plugin crashes on connection close
+
*) [TS-1516] use_client_addr breaks parent proxy configuration
Author: Uri Shachar.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/dc36d49e/plugins/experimental/spdy/stream.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/spdy/stream.cc b/plugins/experimental/spdy/stream.cc
index b7eb4a4..8153299 100644
--- a/plugins/experimental/spdy/stream.cc
+++ b/plugins/experimental/spdy/stream.cc
@@ -231,7 +231,6 @@ spdy_stream_io(TSCont contp, TSEvent ev, void * edata)
if (ev == TS_EVENT_VCONN_EOS || ev == TS_EVENT_VCONN_READ_COMPLETE) {
stream->http_state = spdy_io_stream::http_closed;
spdy_send_data_frame(stream, spdy::FLAG_FIN, nullptr, 0);
- TSVConnClose(stream->vconn);
}
// Kick the IO control block write VIO to make it send the
@@ -329,7 +328,7 @@ spdy_io_stream::close()
if (this->vconn) {
TSVConnClose(this->vconn);
- this->action = nullptr;
+ this->vconn = nullptr;
}
this->http_state = http_closed;