Repository: trafficserver Updated Branches: refs/heads/master 03734d05e -> f49946eae
TS-2709: Another fix to remove the error case test. Not clear you want to do anything different in the error case anyway. If we check the lerrorno argument the error case always triggered and broke the shutdown cleanup. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/f49946ea Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/f49946ea Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/f49946ea Branch: refs/heads/master Commit: f49946eae6373428f89cd52f8895bd07b87e9618 Parents: 03734d0 Author: shinrich <shinr...@yahoo-inc.com> Authored: Thu Mar 26 16:54:01 2015 -0500 Committer: shinrich <shinr...@yahoo-inc.com> Committed: Thu Mar 26 16:54:01 2015 -0500 ---------------------------------------------------------------------- iocore/net/SSLNetVConnection.cc | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f49946ea/iocore/net/SSLNetVConnection.cc ---------------------------------------------------------------------- diff --git a/iocore/net/SSLNetVConnection.cc b/iocore/net/SSLNetVConnection.cc index a1988f2..b0dd272 100644 --- a/iocore/net/SSLNetVConnection.cc +++ b/iocore/net/SSLNetVConnection.cc @@ -766,14 +766,10 @@ void SSLNetVConnection::do_io_close(int lerrno) { if (this->ssl != NULL && sslHandShakeComplete) { - int new_shutdown_mode = 0, shutdown_mode = 0; - if (this->lerrno < 0) { - new_shutdown_mode = SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN; - } else { - shutdown_mode = SSL_get_shutdown(ssl); - Debug("ssl-shutdown", "previous shutdown state 0x%x", shutdown_mode); - new_shutdown_mode = shutdown_mode | SSL_RECEIVED_SHUTDOWN; - } + int shutdown_mode = SSL_get_shutdown(ssl); + Debug("ssl-shutdown", "previous shutdown state 0x%x", shutdown_mode); + int new_shutdown_mode = shutdown_mode | SSL_RECEIVED_SHUTDOWN; + if (new_shutdown_mode != shutdown_mode) { // We do not need to sit around and wait for the client's close-notify if // they have not already sent it. We will still be standards compliant