diff --git a/proxy/ProxyClientSession.cc b/proxy/ProxyClientSession.cc index e9cc18753d7..a240639af17 100644 --- a/proxy/ProxyClientSession.cc +++ b/proxy/ProxyClientSession.cc @@ -208,7 +208,6 @@ ProxyClientSession::handle_api_return(int event) NetVConnection *vc = this->get_netvc(); if (vc) { vc->do_io_close(); - this->release_netvc(); } free(); // You can now clean things up break; diff --git a/proxy/ProxyClientSession.h b/proxy/ProxyClientSession.h index 1a4ece88baf..85f62a0cd55 100644 --- a/proxy/ProxyClientSession.h +++ b/proxy/ProxyClientSession.h @@ -49,7 +49,6 @@ class ProxyClientSession : public VConnection virtual void new_connection(NetVConnection *new_vc, MIOBuffer *iobuf, IOBufferReader *reader, bool backdoor) = 0; virtual NetVConnection *get_netvc() const = 0; - virtual void release_netvc() = 0; virtual int get_transact_count() const = 0; diff --git a/proxy/http/Http1ClientSession.h b/proxy/http/Http1ClientSession.h index cc7f6dd561e..2c6f37c9a74 100644 --- a/proxy/http/Http1ClientSession.h +++ b/proxy/http/Http1ClientSession.h @@ -93,19 +93,6 @@ class Http1ClientSession : public ProxyClientSession return client_vc; } - virtual void - release_netvc() - { - // Make sure the vio's are also released to avoid - // later surprises in inactivity timeout - if (client_vc) { - client_vc->do_io_read(NULL, 0, NULL); - client_vc->do_io_write(NULL, 0, NULL); - client_vc->set_action(NULL); - client_vc = NULL; - } - } - int get_transact_count() const { diff --git a/proxy/http2/Http2ClientSession.cc b/proxy/http2/Http2ClientSession.cc index d67759d5afe..3de5670fcbe 100644 --- a/proxy/http2/Http2ClientSession.cc +++ b/proxy/http2/Http2ClientSession.cc @@ -91,7 +91,6 @@ Http2ClientSession::free() } if (client_vc) { - release_netvc(); client_vc->do_io_close(); client_vc = nullptr; } @@ -275,7 +274,6 @@ Http2ClientSession::do_io_close(int alerrno) // Don't send the SSN_CLOSE_HOOK until we got rid of all the streams // And handled all the TXN_CLOSE_HOOK's if (client_vc) { - this->release_netvc(); client_vc->do_io_close(); client_vc = nullptr; } diff --git a/proxy/http2/Http2ClientSession.h b/proxy/http2/Http2ClientSession.h index ff01c90f128..6a5214105e6 100644 --- a/proxy/http2/Http2ClientSession.h +++ b/proxy/http2/Http2ClientSession.h @@ -182,17 +182,6 @@ class Http2ClientSession : public ProxyClientSession return client_vc; } - void - release_netvc() override - { - // Make sure the vio's are also released to avoid later surprises in inactivity timeout - if (client_vc) { - client_vc->do_io_read(NULL, 0, NULL); - client_vc->do_io_write(NULL, 0, NULL); - client_vc->set_action(NULL); - } - } - sockaddr const * get_client_addr() {