This is an automated email from the ASF dual-hosted git repository. zwoop pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit dc03fc862d652c7583e0d9625e4a28d9921c8aa3 Author: Aaron Canary <acan...@oath.com> AuthorDate: Fri Aug 23 17:09:09 2019 -0500 ProxyTxn: removed restart_immediate because it didn't do anything. + (cherry picked from commit dc1df9981a176cec2ca3de4b6f33e34807575bdb) --- proxy/ProxyTransaction.cc | 11 ----------- proxy/ProxyTransaction.h | 5 ----- proxy/http/Http1ClientSession.cc | 2 -- 3 files changed, 18 deletions(-) diff --git a/proxy/ProxyTransaction.cc b/proxy/ProxyTransaction.cc index 0177924..fb5a49a 100644 --- a/proxy/ProxyTransaction.cc +++ b/proxy/ProxyTransaction.cc @@ -282,17 +282,6 @@ ProxyTransaction::get_protocol_string() return proxy_ssn ? proxy_ssn->get_protocol_string() : nullptr; } -void -ProxyTransaction::set_restart_immediate(bool val) -{ - restart_immediate = true; -} -bool -ProxyTransaction::get_restart_immediate() const -{ - return restart_immediate; -} - int ProxyTransaction::populate_protocol(std::string_view *result, int size) const { diff --git a/proxy/ProxyTransaction.h b/proxy/ProxyTransaction.h index 245c05b..d40e559 100644 --- a/proxy/ProxyTransaction.h +++ b/proxy/ProxyTransaction.h @@ -102,9 +102,6 @@ public: Http1ServerSession *get_server_session() const; HttpSM *get_sm() const; - void set_restart_immediate(bool val); - bool get_restart_immediate() const; - // This function must return a non-negative number that is different for two in-progress transactions with the same proxy_ssn // session. // @@ -120,7 +117,5 @@ protected: HttpSM *current_reader = nullptr; IOBufferReader *sm_reader = nullptr; - bool restart_immediate = false; - private: }; diff --git a/proxy/http/Http1ClientSession.cc b/proxy/http/Http1ClientSession.cc index de6c81e..4258362 100644 --- a/proxy/http/Http1ClientSession.cc +++ b/proxy/http/Http1ClientSession.cc @@ -424,12 +424,10 @@ Http1ClientSession::release(ProxyTransaction *trans) bool more_to_read = this->sm_reader->is_read_avail_more_than(0); if (more_to_read) { trans->destroy(); - trans->set_restart_immediate(true); HttpSsnDebug("[%" PRId64 "] data already in buffer, starting new transaction", con_id); new_transaction(); } else { HttpSsnDebug("[%" PRId64 "] initiating io for next header", con_id); - trans->set_restart_immediate(false); read_state = HCS_KEEP_ALIVE; SET_HANDLER(&Http1ClientSession::state_keep_alive); ka_vio = this->do_io_read(this, INT64_MAX, read_buffer);