trafficserver git commit: Revert "TS-3710: ASAN crash in TLS with 6.0.0"

[sh...@apache.org]

Repository: trafficserver
Updated Branches:
  refs/heads/master d0f908da3 -> 5defa51cd


Revert "TS-3710: ASAN crash in TLS with 6.0.0"

This reverts commit f71d0685333d7853a7ca5ea98fc43b18de1f5488.

Still seeing issues.  Backing out this change until we get the whole issue figured out.


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/5defa51c
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/5defa51c
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/5defa51c

Branch: refs/heads/master
Commit: 5defa51cd3ddcce05b0be4aa3f7b9d5a6f87a111
Parents: d0f908d
Author: shinrich <sh...@yahoo-inc.com>
Authored: Mon Jul 6 09:10:58 2015 -0500
Committer: shinrich <sh...@yahoo-inc.com>
Committed: Mon Jul 6 09:10:58 2015 -0500

----------------------------------------------------------------------
 iocore/net/SSLNextProtocolAccept.cc | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5defa51c/iocore/net/SSLNextProtocolAccept.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLNextProtocolAccept.cc b/iocore/net/SSLNextProtocolAccept.cc
index 7e85e9c..c4748c3 100644
--- a/iocore/net/SSLNextProtocolAccept.cc
+++ b/iocore/net/SSLNextProtocolAccept.cc
@@ -85,7 +85,7 @@ struct SSLNextProtocolTrampoline : public Continuation {
     case VC_EVENT_ERROR:
     case VC_EVENT_ACTIVE_TIMEOUT:
     case VC_EVENT_INACTIVITY_TIMEOUT:
-      netvc->do_io_close();
+      netvc->do_io(VIO::CLOSE);
       delete this;
       return EVENT_ERROR;
     case VC_EVENT_READ_COMPLETE:
@@ -96,15 +96,13 @@ struct SSLNextProtocolTrampoline : public Continuation {
 
     plugin = netvc->endpoint();
     if (plugin) {
-      netvc->do_io_read(NULL, 0, NULL); // Disable the read IO that we started.
       send_plugin_event(plugin, NET_EVENT_ACCEPT, netvc);
     } else if (npnParent->endpoint) {
       // Route to the default endpoint
-      netvc->do_io_read(NULL, 0, NULL); // Disable the read IO that we started.
       send_plugin_event(npnParent->endpoint, NET_EVENT_ACCEPT, netvc);
     } else {
       // No handler, what should we do? Best to just kill the VC while we can.
-      netvc->do_io_close();
+      netvc->do_io(VIO::CLOSE);
     }
 
     delete this;
@@ -132,11 +130,11 @@ SSLNextProtocolAccept::mainEvent(int event, void *edata)
     // the endpoint that there is an accept to handle until the read completes
     // and we know which protocol was negotiated.
     netvc->registerNextProtocolSet(&this->protoset);
-    netvc->do_io_read(new SSLNextProtocolTrampoline(this, netvc->mutex), 0, this->buffer);
+    netvc->do_io(VIO::READ, new SSLNextProtocolTrampoline(this, netvc->mutex), 0, this->buffer, 0);
     netvc->set_session_accept_pointer(this);
     return EVENT_CONT;
   default:
-    netvc->do_io_close();
+    netvc->do_io(VIO::CLOSE);
     return EVENT_DONE;
   }
 }