Merge branch 'pr/820' of https://github.com/stkaufer/websocketpp into stkaufer-pr/820

Peter Thorson · Peter Thorson · commit 6d595399b08a · 2020-07-31T07:26:22.000-05:00
diff --git a/websocketpp/transport/asio/connection.hpp b/websocketpp/transport/asio/connection.hpp
@@ -703,7 +703,6 @@ class connection : public config::socket_type::socket_con_type {
         if (!m_proxy_data) {
             m_elog->write(log::elevel::library,
                 "assertion failed: !m_proxy_data in asio::connection::proxy_read");
-            m_proxy_data->timer->cancel();
             callback(make_error_code(error::general));
             return;
         }

Original file line number	Diff line number	Diff line change
`@@ -703,7 +703,6 @@ class connection : public config::socket_type::socket_con_type {`
`703`	`703`	`if (!m_proxy_data) {`
`704`	`704`	`m_elog->write(log::elevel::library,`
`705`	`705`	`"assertion failed: !m_proxy_data in asio::connection::proxy_read");`
`706`		`- m_proxy_data->timer->cancel();`
`707`	`706`	`callback(make_error_code(error::general));`
`708`	`707`	`return;`
`709`	`708`	`}`