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/03/28 05:33:12 UTC
[5/5] git commit: TS-1162: UnixNetVConnection.cc assertion when
accepting a TLS connection
TS-1162: UnixNetVConnection.cc assertion when accepting a TLS connection
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/a6867032
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/a6867032
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/a6867032
Branch: refs/heads/master
Commit: a6867032e9db6d308f3c508743f9e6669cf9f5e7
Parents: 0dcad6e
Author: James Peach <jp...@apache.org>
Authored: Sat Mar 24 14:57:27 2012 -0700
Committer: James Peach <jp...@apache.org>
Committed: Tue Mar 27 20:32:26 2012 -0700
----------------------------------------------------------------------
CHANGES | 2 ++
iocore/net/SSLNextProtocolAccept.cc | 5 +++++
2 files changed, 7 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a6867032/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 0611a24..ccaed32 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 3.1.4
+ *) [TS-1162] UnixNetVConnection assertion when accepting a TLS connection
+
*) [TS-1135] support wildcard certificates for ServerNameIndication (SNI)
*) [TS-1140] Combine IP Allow and QuickFilter.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a6867032/iocore/net/SSLNextProtocolAccept.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLNextProtocolAccept.cc b/iocore/net/SSLNextProtocolAccept.cc
index 963fd7e..f26b67e 100644
--- a/iocore/net/SSLNextProtocolAccept.cc
+++ b/iocore/net/SSLNextProtocolAccept.cc
@@ -63,6 +63,11 @@ SSLNextProtocolAccept::mainEvent(int event, void * edata)
Debug("ssl",
"[SSLNextProtocolAccept:mainEvent] event %d netvc %p", event, netvc);
+ if (!netvc) {
+ return EVENT_DONE;
+ }
+
+ MUTEX_LOCK(lock, this->mutex, this_ethread());
switch (event) {
case NET_EVENT_ACCEPT: