This is an automated email from the ASF dual-hosted git repository. zwoop pushed a commit to branch 7.1.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 44c8d525648acd3818649b5e02b35b854f27e14a Author: Jeffrey Bevill <[email protected]> AuthorDate: Sat Mar 10 20:52:21 2018 +0000 Change proxy/logging/LogAccessHttp.h from using 'virtual' to 'override'. (cherry picked from commit 6cdc1147a1bbf4290c735176cbc779a78d7dbcb3) Conflicts: proxy/http2/Http2Stream.h proxy/logging/LogAccessHttp.h (cherry picked from commit e2dfa5ac870348ebeb024b99da2dfd6549e99e06) --- proxy/http2/Http2Stream.h | 26 +++---- proxy/logging/LogAccessHttp.h | 159 +++++++++++++++++++++--------------------- 2 files changed, 93 insertions(+), 92 deletions(-) diff --git a/proxy/http2/Http2Stream.h b/proxy/http2/Http2Stream.h index 48043ee..f8afc11 100644 --- a/proxy/http2/Http2Stream.h +++ b/proxy/http2/Http2Stream.h @@ -90,7 +90,7 @@ public: ~Http2Stream() { this->destroy(); } int main_event_handler(int event, void *edata); - void destroy(); + void destroy() override; bool is_body_done() const @@ -176,17 +176,17 @@ public: Http2ErrorCode decode_header_blocks(HpackHandle &hpack_handle, uint32_t maximum_table_size); void send_request(Http2ConnectionState &cstate); - VIO *do_io_read(Continuation *c, int64_t nbytes, MIOBuffer *buf); - VIO *do_io_write(Continuation *c, int64_t nbytes, IOBufferReader *abuffer, bool owner = false); - void do_io_close(int lerrno = -1); + VIO *do_io_read(Continuation *c, int64_t nbytes, MIOBuffer *buf) override; + VIO *do_io_write(Continuation *c, int64_t nbytes, IOBufferReader *abuffer, bool owner = false) override; + void do_io_close(int lerrno = -1) override; void initiating_close(); void terminate_if_possible(); - void do_io_shutdown(ShutdownHowTo_t) {} + void do_io_shutdown(ShutdownHowTo_t) override {} void update_read_request(int64_t read_len, bool send_update); void update_write_request(IOBufferReader *buf_reader, int64_t write_len, bool send_update); void signal_write_event(bool call_update); - void reenable(VIO *vio); - virtual void transaction_done(); + void reenable(VIO *vio) override; + virtual void transaction_done() override; void restart_sending(); void push_promise(URL &url, const MIMEField *accept_encoding); @@ -226,17 +226,17 @@ public: return chunked; } - void release(IOBufferReader *r); + void release(IOBufferReader *r) override; virtual bool - allow_half_open() const + allow_half_open() const override { return false; } - virtual void set_active_timeout(ink_hrtime timeout_in); - virtual void set_inactivity_timeout(ink_hrtime timeout_in); - virtual void cancel_inactivity_timeout(); + virtual void set_active_timeout(ink_hrtime timeout_in) override; + virtual void set_inactivity_timeout(ink_hrtime timeout_in) override; + virtual void cancel_inactivity_timeout() override; void clear_inactive_timer(); void clear_active_timer(); void clear_timers(); @@ -256,7 +256,7 @@ public: } bool - is_first_transaction() const + is_first_transaction() const override { return is_first_transaction_flag; } diff --git a/proxy/logging/LogAccessHttp.h b/proxy/logging/LogAccessHttp.h index 6d4632f..a411bfc 100644 --- a/proxy/logging/LogAccessHttp.h +++ b/proxy/logging/LogAccessHttp.h @@ -42,12 +42,12 @@ class LogAccessHttp : public LogAccess { public: LogAccessHttp(HttpSM *sm); - virtual ~LogAccessHttp(); + ~LogAccessHttp() override; - void init(); + void init() override; LogEntryType - entry_type() const + entry_type() const override { return LOG_ENTRY_HTTP; } @@ -55,94 +55,94 @@ public: // // client -> proxy fields // - virtual int marshal_client_host_ip(char *); // STR - virtual int marshal_host_interface_ip(char *); // STR - virtual int marshal_client_host_port(char *); // INT - virtual int marshal_client_auth_user_name(char *); // STR - virtual int marshal_client_req_text(char *); // STR - virtual int marshal_client_req_http_method(char *); // INT - virtual int marshal_client_req_url(char *); // STR - virtual int marshal_client_req_url_canon(char *); // STR - virtual int marshal_client_req_unmapped_url_canon(char *); // STR - virtual int marshal_client_req_unmapped_url_path(char *); // STR - virtual int marshal_client_req_unmapped_url_host(char *); // STR - virtual int marshal_client_req_url_path(char *); // STR - virtual int marshal_client_req_url_scheme(char *); // STR - virtual int marshal_client_req_http_version(char *); // INT - virtual int marshal_client_req_protocol_version(char *); // STR - virtual int marshal_client_req_header_len(char *); // INT - virtual int marshal_client_req_content_len(char *); // INT - virtual int marshal_client_req_squid_len(char *); // INT - virtual int marshal_client_req_tcp_reused(char *); // INT - virtual int marshal_client_req_is_ssl(char *); // INT - virtual int marshal_client_req_ssl_reused(char *); // INT - virtual int marshal_client_req_timestamp_sec(char *); // INT - virtual int marshal_client_req_timestamp_ms(char *); // INT - virtual int marshal_client_security_protocol(char *); // STR - virtual int marshal_client_security_cipher_suite(char *); // STR - virtual int marshal_client_finish_status_code(char *); // INT - virtual int marshal_client_req_id(char *); // INT - virtual int marshal_client_req_uuid(char *); // STR + int marshal_client_host_ip(char *) override; // STR + int marshal_host_interface_ip(char *) override; // STR + int marshal_client_host_port(char *) override; // INT + int marshal_client_auth_user_name(char *) override; // STR + int marshal_client_req_text(char *) override; // STR + int marshal_client_req_http_method(char *) override; // INT + int marshal_client_req_url(char *) override; // STR + int marshal_client_req_url_canon(char *) override; // STR + int marshal_client_req_unmapped_url_canon(char *) override; // STR + int marshal_client_req_unmapped_url_path(char *) override; // STR + int marshal_client_req_unmapped_url_host(char *) override; // STR + int marshal_client_req_url_path(char *) override; // STR + int marshal_client_req_url_scheme(char *) override; // STR + int marshal_client_req_http_version(char *) override; // INT + int marshal_client_req_protocol_version(char *) override; // STR + int marshal_client_req_header_len(char *) override; // INT + int marshal_client_req_content_len(char *) override; // INT + int marshal_client_req_squid_len(char *) override; // INT + int marshal_client_req_tcp_reused(char *) override; // INT + int marshal_client_req_is_ssl(char *) override; // INT + int marshal_client_req_ssl_reused(char *) override; // INT + int marshal_client_req_timestamp_sec(char *) override; // INT + int marshal_client_req_timestamp_ms(char *) override; // INT + int marshal_client_security_protocol(char *) override; // STR + int marshal_client_security_cipher_suite(char *) override; // STR + int marshal_client_finish_status_code(char *) override; // INT + int marshal_client_req_id(char *) override; // INT + int marshal_client_req_uuid(char *) override; // STR // // proxy -> client fields // - virtual int marshal_proxy_resp_content_type(char *); // STR - virtual int marshal_proxy_resp_header_len(char *); // INT - virtual int marshal_proxy_resp_content_len(char *); // INT - virtual int marshal_proxy_resp_squid_len(char *); // INT - virtual int marshal_proxy_resp_status_code(char *); // INT - virtual int marshal_proxy_finish_status_code(char *); // INT - virtual int marshal_cache_result_code(char *); // INT - virtual int marshal_cache_hit_miss(char *); // INT + int marshal_proxy_resp_content_type(char *) override; // STR + int marshal_proxy_resp_header_len(char *) override; // INT + int marshal_proxy_resp_content_len(char *) override; // INT + int marshal_proxy_resp_squid_len(char *) override; // INT + int marshal_proxy_resp_status_code(char *) override; // INT + int marshal_proxy_finish_status_code(char *) override; // INT + int marshal_cache_result_code(char *) override; // INT + int marshal_cache_hit_miss(char *) override; // INT // // proxy -> server fields // - virtual int marshal_proxy_req_header_len(char *); // INT - virtual int marshal_proxy_req_content_len(char *); // INT - virtual int marshal_proxy_req_squid_len(char *); // INT - virtual int marshal_proxy_req_server_name(char *); // STR - virtual int marshal_proxy_req_server_ip(char *); // INT - virtual int marshal_proxy_req_server_port(char *); // INT - virtual int marshal_proxy_hierarchy_route(char *); // INT - virtual int marshal_proxy_host_port(char *); // INT - virtual int marshal_proxy_req_is_ssl(char *); // INT + int marshal_proxy_req_header_len(char *) override; // INT + int marshal_proxy_req_content_len(char *) override; // INT + int marshal_proxy_req_squid_len(char *) override; // INT + int marshal_proxy_req_server_name(char *) override; // STR + int marshal_proxy_req_server_ip(char *) override; // INT + int marshal_proxy_req_server_port(char *) override; // INT + int marshal_proxy_hierarchy_route(char *) override; // INT + int marshal_proxy_host_port(char *) override; // INT + int marshal_proxy_req_is_ssl(char *) override; // INT // // server -> proxy fields // - virtual int marshal_server_host_ip(char *); // INT - virtual int marshal_server_host_name(char *); // STR - virtual int marshal_server_resp_status_code(char *); // INT - virtual int marshal_server_resp_header_len(char *); // INT - virtual int marshal_server_resp_content_len(char *); // INT - virtual int marshal_server_resp_squid_len(char *); // INT - virtual int marshal_server_resp_http_version(char *); // INT - virtual int marshal_server_resp_time_ms(char *); // INT - virtual int marshal_server_resp_time_s(char *); // INT - virtual int marshal_server_transact_count(char *); // INT - virtual int marshal_server_connect_attempts(char *); // INT + int marshal_server_host_ip(char *) override; // INT + int marshal_server_host_name(char *) override; // STR + int marshal_server_resp_status_code(char *) override; // INT + int marshal_server_resp_header_len(char *) override; // INT + int marshal_server_resp_content_len(char *) override; // INT + int marshal_server_resp_squid_len(char *) override; // INT + int marshal_server_resp_http_version(char *) override; // INT + int marshal_server_resp_time_ms(char *) override; // INT + int marshal_server_resp_time_s(char *) override; // INT + int marshal_server_transact_count(char *) override; // INT + int marshal_server_connect_attempts(char *) override; // INT // // cache -> client fields // - virtual int marshal_cache_resp_status_code(char *); // INT - virtual int marshal_cache_resp_header_len(char *); // INT - virtual int marshal_cache_resp_content_len(char *); // INT - virtual int marshal_cache_resp_squid_len(char *); // INT - virtual int marshal_cache_resp_http_version(char *); // INT + int marshal_cache_resp_status_code(char *) override; // INT + int marshal_cache_resp_header_len(char *) override; // INT + int marshal_cache_resp_content_len(char *) override; // INT + int marshal_cache_resp_squid_len(char *) override; // INT + int marshal_cache_resp_http_version(char *) override; // INT // // congestion control client_retry_after_time // - virtual int marshal_client_retry_after_time(char *); // INT + int marshal_client_retry_after_time(char *) override; // INT // // cache write fields // - virtual int marshal_cache_write_code(char *); // INT - virtual int marshal_cache_write_transform_code(char *); // INT + int marshal_cache_write_code(char *) override; // INT + int marshal_cache_write_transform_code(char *) override; // INT // // other fields @@ -159,20 +159,21 @@ public: // // named fields from within a http header // - virtual int marshal_http_header_field(LogField::Container container, char *field, char *buf); - virtual int marshal_http_header_field_escapify(LogField::Container container, char *field, char *buf); + int marshal_http_header_field(LogField::Container container, char *field, char *buf) override; + int marshal_http_header_field_escapify(LogField::Container container, char *field, char *buf) override; - virtual int marshal_milestone(TSMilestonesType ms, char *buf); - virtual int marshal_milestone_fmt_sec(TSMilestonesType ms, char *buf); - virtual int marshal_milestone_fmt_ms(TSMilestonesType ms, char *buf); - virtual int marshal_milestone_diff(TSMilestonesType ms1, TSMilestonesType ms2, char *buf); + int marshal_milestone(TSMilestonesType ms, char *buf) override; + int marshal_milestone_fmt_sec(TSMilestonesType ms, char *buf) override; + int marshal_milestone_diff(TSMilestonesType ms1, TSMilestonesType ms2, char *buf) override; - virtual void set_client_req_url(char *, int); // STR - virtual void set_client_req_url_canon(char *, int); // STR - virtual void set_client_req_unmapped_url_canon(char *, int); // STR - virtual void set_client_req_unmapped_url_path(char *, int); // STR - virtual void set_client_req_unmapped_url_host(char *, int); // STR - virtual void set_client_req_url_path(char *, int); // STR + int marshal_milestone_fmt_ms(TSMilestonesType ms, char *buf); + + void set_client_req_url(char *, int) override; // STR + void set_client_req_url_canon(char *, int) override; // STR + void set_client_req_unmapped_url_canon(char *, int) override; // STR + void set_client_req_unmapped_url_path(char *, int) override; // STR + void set_client_req_unmapped_url_host(char *, int) override; // STR + void set_client_req_url_path(char *, int) override; // STR private: HttpSM *m_http_sm; -- To stop receiving notification emails like this one, please contact [email protected].
