From 02c85ff3648b5d370921bd72c5f14cd58af5d8be Mon Sep 17 00:00:00 2001 From: Susan Hinrichs Date: Fri, 26 Mar 2021 18:56:33 +0000 Subject: [PATCH] Add default implementation for allow_half_open --- proxy/ProxyTransaction.cc | 6 ++++++ proxy/ProxyTransaction.h | 2 +- proxy/http2/Http2Stream.h | 7 ------- proxy/http3/Http3Transaction.cc | 6 ------ proxy/http3/Http3Transaction.h | 1 - 5 files changed, 7 insertions(+), 15 deletions(-) diff --git a/proxy/ProxyTransaction.cc b/proxy/ProxyTransaction.cc index fff5fe75eeb..50d6682217d 100644 --- a/proxy/ProxyTransaction.cc +++ b/proxy/ProxyTransaction.cc @@ -220,3 +220,9 @@ ProxyTransaction::has_request_body(int64_t request_content_length, bool is_chunk { return request_content_length > 0 || is_chunked; } + +bool +ProxyTransaction::allow_half_open() const +{ + return false; +} diff --git a/proxy/ProxyTransaction.h b/proxy/ProxyTransaction.h index 976751039d5..0ae77f58145 100644 --- a/proxy/ProxyTransaction.h +++ b/proxy/ProxyTransaction.h @@ -62,7 +62,7 @@ class ProxyTransaction : public VConnection virtual int get_transaction_id() const = 0; virtual int get_transaction_priority_weight() const; virtual int get_transaction_priority_dependence() const; - virtual bool allow_half_open() const = 0; + virtual bool allow_half_open() const; virtual void increment_client_transactions_stat() = 0; virtual void decrement_client_transactions_stat() = 0; diff --git a/proxy/http2/Http2Stream.h b/proxy/http2/Http2Stream.h index 1d8d7b61453..99271494127 100644 --- a/proxy/http2/Http2Stream.h +++ b/proxy/http2/Http2Stream.h @@ -100,7 +100,6 @@ class Http2Stream : public ProxyTransaction bool is_active_timeout_expired(ink_hrtime now); bool is_inactive_timeout_expired(ink_hrtime now); - bool allow_half_open() const override; bool is_first_transaction() const override; void increment_client_transactions_stat() override; void decrement_client_transactions_stat() override; @@ -294,12 +293,6 @@ Http2Stream::payload_length_is_valid() const return content_length == 0 || content_length == data_length; } -inline bool -Http2Stream::allow_half_open() const -{ - return false; -} - inline bool Http2Stream::is_client_state_writeable() const { diff --git a/proxy/http3/Http3Transaction.cc b/proxy/http3/Http3Transaction.cc index c2f9de350ef..04afaa4a541 100644 --- a/proxy/http3/Http3Transaction.cc +++ b/proxy/http3/Http3Transaction.cc @@ -110,12 +110,6 @@ HQTransaction::release(IOBufferReader *r) this->_sm = nullptr; } -bool -HQTransaction::allow_half_open() const -{ - return false; -} - VIO * HQTransaction::do_io_read(Continuation *c, int64_t nbytes, MIOBuffer *buf) { diff --git a/proxy/http3/Http3Transaction.h b/proxy/http3/Http3Transaction.h index 00826ea0904..9e643d6df5c 100644 --- a/proxy/http3/Http3Transaction.h +++ b/proxy/http3/Http3Transaction.h @@ -49,7 +49,6 @@ class HQTransaction : public ProxyTransaction void set_inactivity_timeout(ink_hrtime timeout_in) override; void cancel_inactivity_timeout() override; void transaction_done() override; - bool allow_half_open() const override; void release(IOBufferReader *r) override; int get_transaction_id() const override; void increment_client_transactions_stat() override;