[trafficserver] branch master updated: Fix TS-3612 build error with SPDY.

[sh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

shinrich pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git

The following commit(s) were added to refs/heads/master by this push:
       new  3c5f107   Fix TS-3612 build error with SPDY.
3c5f107 is described below

commit 3c5f107d0c56415033d7f6edcc25055513f2d411
Author: shinrich <sh...@yahoo-inc.com>
AuthorDate: Sat Apr 16 11:47:49 2016 -0500

    Fix TS-3612 build error with SPDY.
---
 proxy/spdy/SpdyClientSession.cc | 13 -------------
 proxy/spdy/SpdySessionAccept.cc |  9 +--------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/proxy/spdy/SpdyClientSession.cc b/proxy/spdy/SpdyClientSession.cc
index ae7c737..3f946fb 100644
--- a/proxy/spdy/SpdyClientSession.cc
+++ b/proxy/spdy/SpdyClientSession.cc
@@ -160,11 +160,6 @@ SpdyClientSession::clear()
   this->mutex = NULL;
 
   if (vc) {
-    // clean up ssl's first byte iobuf
-    SSLNetVConnection *ssl_vc = dynamic_cast<SSLNetVConnection *>(vc);
-    if (ssl_vc) {
-      ssl_vc->set_ssl_iobuf(NULL);
-    }
     TSVConnClose(reinterpret_cast<TSVConn>(vc));
     vc = NULL;
   }
@@ -507,14 +502,6 @@ spdy_process_fetch_body(TSEvent event, SpdyClientSession *sm, TSFetchSM fetch_sm
 void
 SpdyClientSession::do_io_close(int alertno)
 {
-  if (vc) {
-    // vc is released (null'ed) within ProxyClientSession when handling
-    // TS_HTTP_SSN_CLOSE_HOOK, so, reset ssl_iobuf to prevent double free
-    SSLNetVConnection *ssl_vc = dynamic_cast<SSLNetVConnection *>(vc);
-    if (ssl_vc) {
-      ssl_vc->set_ssl_iobuf(NULL);
-    }
-  }
   // The object will be cleaned up from within ProxyClientSession::handle_api_return
   // This way, the object will still be alive for any SSN_CLOSE hooks
   do_api_callout(TS_HTTP_SSN_CLOSE_HOOK);
diff --git a/proxy/spdy/SpdySessionAccept.cc b/proxy/spdy/SpdySessionAccept.cc
index 292cadb..96c4043 100644
--- a/proxy/spdy/SpdySessionAccept.cc
+++ b/proxy/spdy/SpdySessionAccept.cc
@@ -46,14 +46,7 @@ SpdySessionAccept::mainEvent(int event, void *edata)
     SpdyClientSession *sm = SpdyClientSession::alloc();
     sm->version = this->version;
 
-    SSLNetVConnection *ssl_vc = dynamic_cast<SSLNetVConnection *>(netvc);
-    MIOBuffer *iobuf = NULL;
-    IOBufferReader *reader = NULL;
-    if (ssl_vc) {
-      iobuf = ssl_vc->get_ssl_iobuf();
-      reader = ssl_vc->get_ssl_reader();
-    }
-    sm->new_connection(netvc, iobuf, reader, false);
+    sm->new_connection(netvc, NULL, NULL, false);
 #else
     Error("accepted a SPDY session, but SPDY support is not available");
     netvc->do_io_close();

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].